mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2025-03-25 23:37:58 +00:00
Code Issues Projects Releases Wiki Activity

NOISSUE shortcut creation: set working directory in other shortcut types

Browse Source
This commit is contained in:
arthomnix 2022-07-03 14:00:55 +01:00
parent 7217e3991a
commit 75b8765604
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
launcher/ui/dialogs/CreateShortcutDialog.cpp
View File

@ -125,7 +125,9 @@ void CreateShortcutDialog::createShortcut()
// Unix shell script // Unix shell script
if (ui->createScriptCheckBox->isChecked()) if (ui->createScriptCheckBox->isChecked())
{ {
shortcutText = "#!/bin/sh\n" + getLaunchCommand() + " &\n"; shortcutText = "#!/bin/sh\n"
+ "cd " + QCoreApplication::applicationDirPath() + "\n"
+ getLaunchCommand() + " &\n";
} else } else
// freedesktop.org desktop entry // freedesktop.org desktop entry
{ {
@ -148,6 +150,7 @@ void CreateShortcutDialog::createShortcut()
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
// Windows batch script implementation // Windows batch script implementation
shortcutText = "@ECHO OFF\r\n" shortcutText = "@ECHO OFF\r\n"
"CD " + QDir::toNativeSeparators(QCoreApplication::applicationDirPath()) + "\r\n"
"START /B " + getLaunchCommand() + "\r\n"; "START /B " + getLaunchCommand() + "\r\n";
#endif #endif
QFile shortcutFile(ui->shortcutPath->text()); QFile shortcutFile(ui->shortcutPath->text());
@ -170,6 +173,7 @@ void CreateShortcutDialog::createShortcut()
} }
createWindowsLink(QDir::toNativeSeparators(QCoreApplication::applicationFilePath()).toStdString().c_str(), createWindowsLink(QDir::toNativeSeparators(QCoreApplication::applicationFilePath()).toStdString().c_str(),
QDir::toNativeSeparators(QCoreApplication::applicationFilePath()).toStdString().c_str(),
getLaunchArgs().toStdString().c_str(), getLaunchArgs().toStdString().c_str(),
ui->shortcutPath->text().toStdString().c_str(), ui->shortcutPath->text().toStdString().c_str(),
(m_instance->name() + " - " + BuildConfig.LAUNCHER_DISPLAYNAME).toStdString().c_str(), (m_instance->name() + " - " + BuildConfig.LAUNCHER_DISPLAYNAME).toStdString().c_str(),
@ -180,7 +184,8 @@ void CreateShortcutDialog::createShortcut()
} }
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
void CreateShortcutDialog::createWindowsLink(LPCSTR target, LPCSTR args, LPCSTR filename, LPCSTR desc, LPCSTR iconPath) void CreateShortcutDialog::createWindowsLink(LPCSTR target, LPCSTR workingDir, LPCSTR args, LPCSTR filename,
LPCSTR desc, LPCSTR iconPath)
{ {
HRESULT result; HRESULT result;
IShellLink *link; IShellLink *link;
@ -192,6 +197,7 @@ void CreateShortcutDialog::createWindowsLink(LPCSTR target, LPCSTR args, LPCSTR
IPersistFile *file; IPersistFile *file;
link->SetPath(target); link->SetPath(target);
link->SetWorkingDirectory(workingDir);
link->SetArguments(args); link->SetArguments(args);
link->SetDescription(desc); link->SetDescription(desc);
link->SetIconLocation(iconPath, 0); link->SetIconLocation(iconPath, 0);

2
launcher/ui/dialogs/CreateShortcutDialog.h
View File

@ -44,6 +44,6 @@ private:
void createShortcut(); void createShortcut();
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
void createWindowsLink(LPCSTR target, LPCSTR args, LPCSTR filename, LPCSTR desc, LPCSTR iconPath); void createWindowsLink(LPCSTR target, LPCSTR workingDir, LPCSTR args, LPCSTR filename, LPCSTR desc, LPCSTR iconPath);
#endif #endif
}; };