From be6d6501e83818e10c88ef1240cf5c69358d8bed Mon Sep 17 00:00:00 2001
From: timoreo <contact@timoreo.fr>
Date: Thu, 11 Aug 2022 07:33:13 +0200
Subject: [PATCH] Merge pull request #1039 from
 budak7273/fix-world-safety-nag-title-text

---
 launcher/ui/pages/instance/WorldListPage.cpp | 12 ++++++------
 launcher/ui/pages/instance/WorldListPage.h   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/launcher/ui/pages/instance/WorldListPage.cpp b/launcher/ui/pages/instance/WorldListPage.cpp
index 647b04a75..85cc01ff0 100644
--- a/launcher/ui/pages/instance/WorldListPage.cpp
+++ b/launcher/ui/pages/instance/WorldListPage.cpp
@@ -211,7 +211,7 @@ void WorldListPage::on_actionDatapacks_triggered()
         return;
     }
 
-    if(!worldSafetyNagQuestion())
+    if(!worldSafetyNagQuestion(tr("Open World Datapacks Folder")))
         return;
 
     auto fullPath = m_worlds->data(index, WorldList::FolderRole).toString();
@@ -269,7 +269,7 @@ void WorldListPage::on_actionMCEdit_triggered()
         return;
     }
 
-    if(!worldSafetyNagQuestion())
+    if(!worldSafetyNagQuestion(tr("Open World in MCEdit")))
         return;
 
     auto fullPath = m_worlds->data(index, WorldList::FolderRole).toString();
@@ -373,11 +373,11 @@ bool WorldListPage::isWorldSafe(QModelIndex)
     return !m_inst->isRunning();
 }
 
-bool WorldListPage::worldSafetyNagQuestion()
+bool WorldListPage::worldSafetyNagQuestion(const QString &actionType)
 {
     if(!isWorldSafe(getSelectedWorld()))
     {
-        auto result = QMessageBox::question(this, tr("Copy World"), tr("Changing a world while Minecraft is running is potentially unsafe.\nDo you wish to proceed?"));
+        auto result = QMessageBox::question(this, actionType, tr("Changing a world while Minecraft is running is potentially unsafe.\nDo you wish to proceed?"));
         if(result == QMessageBox::No)
         {
             return false;
@@ -395,7 +395,7 @@ void WorldListPage::on_actionCopy_triggered()
         return;
     }
 
-    if(!worldSafetyNagQuestion())
+    if(!worldSafetyNagQuestion(tr("Copy World")))
         return;
 
     auto worldVariant = m_worlds->data(index, WorldList::ObjectRole);
@@ -417,7 +417,7 @@ void WorldListPage::on_actionRename_triggered()
         return;
     }
 
-    if(!worldSafetyNagQuestion())
+    if(!worldSafetyNagQuestion(tr("Rename World")))
         return;
 
     auto worldVariant = m_worlds->data(index, WorldList::ObjectRole);
diff --git a/launcher/ui/pages/instance/WorldListPage.h b/launcher/ui/pages/instance/WorldListPage.h
index 17e36a081..1dc9e53e0 100644
--- a/launcher/ui/pages/instance/WorldListPage.h
+++ b/launcher/ui/pages/instance/WorldListPage.h
@@ -93,7 +93,7 @@ protected:
 private:
     QModelIndex getSelectedWorld();
     bool isWorldSafe(QModelIndex index);
-    bool worldSafetyNagQuestion();
+    bool worldSafetyNagQuestion(const QString &actionType);
     void mceditError();
 
 private: