mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2024-07-08 13:58:46 +00:00
Code Issues Projects Releases Wiki Activity

NOISSUE Escape quotes in paths

Browse Source 
Just in case the user decides to place MMC in a path containing quotes.
.desktop files appear to require two backslashes to escape quotes, testing on other desktop environments would be appreciated to make sure this isn't just a KDE-specific bug
This commit is contained in:
arthomnix 2022-07-31 11:38:00 +01:00 committed by Petr Mrázek
parent 08dd08afc1
commit 858487521e
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,15 +107,15 @@ void CreateShortcutDialog::updateDialogState()
}
}
QString CreateShortcutDialog::getLaunchCommand()
QString CreateShortcutDialog::getLaunchCommand(bool escapeQuotesTwice)
{
return "\"" + QDir::toNativeSeparators(QCoreApplication::applicationFilePath()) + "\""
+ getLaunchArgs();
return "\"" + QDir::toNativeSeparators(QCoreApplication::applicationFilePath()).replace('"', escapeQuotesTwice ? "\\\\\"" : "\\\"") + "\""
+ getLaunchArgs(escapeQuotesTwice);
}
QString CreateShortcutDialog::getLaunchArgs()
QString CreateShortcutDialog::getLaunchArgs(bool escapeQuotesTwice)
{
return " -d \"" + QDir::toNativeSeparators(QDir::currentPath()) + "\""
return " -d \"" + QDir::toNativeSeparators(QDir::currentPath()).replace('"', escapeQuotesTwice ? "\\\\\"" : "\\\"") + "\""
+ " -l \"" + m_instance->id() + "\""
+ (ui->joinServerCheckBox->isChecked() ? " -s \"" + ui->joinServer->text() + "\"" : "")
+ (ui->useProfileCheckBox->isChecked() ? " -a \"" + ui->profileComboBox->currentText() + "\"" : "")
@ -137,7 +137,7 @@ void CreateShortcutDialog::createShortcut()
{
shortcutText = "#!/bin/sh\n"
// FIXME: is there a way to use the launcher script instead of the raw binary here?
"cd \"" + QDir::currentPath() + "\"\n"
"cd \"" + QDir::currentPath().replace('"', "\\\"") + "\"\n"
+ getLaunchCommand() + " &\n";
} else
// freedesktop.org desktop entry
@ -152,7 +152,7 @@ void CreateShortcutDialog::createShortcut()
shortcutText = "[Desktop Entry]\n"
"Type=Application\n"
"Name=" + m_instance->name() + " - " + BuildConfig.LAUNCHER_DISPLAYNAME + "\n"
+ "Exec=" + getLaunchCommand() + "\n"
+ "Exec=" + getLaunchCommand(true) + "\n"
+ "Path=" + QDir::currentPath() + "\n"
+ "Icon=" + QDir::currentPath() + "/icons/shortcut-icon.png\n";

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

@ -39,8 +39,8 @@ private:
Ui::CreateShortcutDialog *ui;
InstancePtr m_instance;
QString getLaunchCommand();
QString getLaunchArgs();
QString getLaunchCommand(bool escapeQuotesTwice = false);
QString getLaunchArgs(bool escapeQuotesTwice = false);
void createShortcut();