From a89caf7362d595a66c37d06a77f56270042784f4 Mon Sep 17 00:00:00 2001
From: Yihe Li <winmikedows@hotmail.com>
Date: Thu, 22 May 2025 23:09:29 +0800
Subject: [PATCH] Apply suggestions from review

Signed-off-by: Yihe Li <winmikedows@hotmail.com>
---
 launcher/minecraft/ShortcutUtils.cpp         |  2 +-
 launcher/ui/dialogs/CreateShortcutDialog.cpp | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/launcher/minecraft/ShortcutUtils.cpp b/launcher/minecraft/ShortcutUtils.cpp
index ea2a988be..43954aa6a 100644
--- a/launcher/minecraft/ShortcutUtils.cpp
+++ b/launcher/minecraft/ShortcutUtils.cpp
@@ -149,7 +149,7 @@ void createInstanceShortcut(const Shortcut& shortcut, const QString& filePath)
     args.append({ "--launch", shortcut.instance->id() });
     args.append(shortcut.extraArgs);
 
-    if (!FS::createShortcut(std::move(filePath), appPath, args, shortcut.name, iconPath)) {
+    if (!FS::createShortcut(filePath, appPath, args, shortcut.name, iconPath)) {
 #if not defined(Q_OS_MACOS)
         iconFile.remove();
 #endif
diff --git a/launcher/ui/dialogs/CreateShortcutDialog.cpp b/launcher/ui/dialogs/CreateShortcutDialog.cpp
index 6fb6e7050..581ac29e3 100644
--- a/launcher/ui/dialogs/CreateShortcutDialog.cpp
+++ b/launcher/ui/dialogs/CreateShortcutDialog.cpp
@@ -81,12 +81,12 @@ CreateShortcutDialog::CreateShortcutDialog(InstancePtr instance, QWidget* parent
         QString applicationDir = FS::getApplicationsDir();
 
         if (!desktopDir.isEmpty())
-            ui->saveTargetSelectionBox->addItem("Desktop", QVariant::fromValue(SaveTarget::Desktop));
+            ui->saveTargetSelectionBox->addItem(tr("Desktop"), QVariant::fromValue(SaveTarget::Desktop));
 
         if (!applicationDir.isEmpty())
-            ui->saveTargetSelectionBox->addItem("Applications", QVariant::fromValue(SaveTarget::Applications));
+            ui->saveTargetSelectionBox->addItem(tr("Applications"), QVariant::fromValue(SaveTarget::Applications));
     }
-    ui->saveTargetSelectionBox->addItem("Other...", QVariant::fromValue(SaveTarget::Other));
+    ui->saveTargetSelectionBox->addItem(tr("Other..."), QVariant::fromValue(SaveTarget::Other));
 
     // Populate worlds
     if (m_QuickJoinSupported) {
@@ -105,7 +105,7 @@ CreateShortcutDialog::CreateShortcutDialog(InstancePtr instance, QWidget* parent
     MinecraftAccountPtr defaultAccount = accounts->defaultAccount();
     if (accounts->count() <= 0) {
         ui->overrideAccountCheckbox->setEnabled(false);
-    } else
+    } else {
         for (int i = 0; i < accounts->count(); i++) {
             MinecraftAccountPtr account = accounts->at(i);
             auto profileLabel = account->profileName();
@@ -118,6 +118,7 @@ CreateShortcutDialog::CreateShortcutDialog(InstancePtr instance, QWidget* parent
             if (defaultAccount == account)
                 ui->accountSelectionBox->setCurrentIndex(i);
         }
+    }
 }
 
 CreateShortcutDialog::~CreateShortcutDialog()
@@ -183,9 +184,11 @@ void CreateShortcutDialog::stateChanged()
     ui->instNameTextBox->setPlaceholderText(result);
     if (!ui->targetCheckbox->isChecked())
         ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
-    else
+    else {
         ui->buttonBox->button(QDialogButtonBox::Ok)
-            ->setEnabled(ui->worldTarget->isChecked() || (ui->serverTarget->isChecked() && !ui->serverAddressBox->text().isEmpty()));
+            ->setEnabled((ui->worldTarget->isChecked() && ui->worldSelectionBox->currentIndex() != -1) ||
+                         (ui->serverTarget->isChecked() && !ui->serverAddressBox->text().isEmpty()));
+    }
 }
 
 // Real work