Merge branch 'develop' into better-launch

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>

1 files changed, 9 insertions, 17 deletions

diff --git a/launcher/tools/MCEditTool.cpp b/launcher/tools/MCEditTool.cpp
index 2c1ec613..19bd5a06 100644
--- a/launcher/tools/MCEditTool.cpp
+++ b/launcher/tools/MCEditTool.cpp
@@ -4,9 +4,9 @@
 #include <QProcess>
 #include <QUrl>
 
-#include "settings/SettingsObject.h"
 #include "BaseInstance.h"
 #include "minecraft/MinecraftInstance.h"
+#include "settings/SettingsObject.h"
 
 MCEditTool::MCEditTool(SettingsObjectPtr settings)
 {
@@ -26,19 +26,17 @@ QString MCEditTool::path() const
 
 bool MCEditTool::check(const QString& toolPath, QString& error)
 {
-    if (toolPath.isEmpty())
-    {
+    if (toolPath.isEmpty()) {
         error = QObject::tr("Path is empty");
         return false;
     }
     const QDir dir(toolPath);
-    if (!dir.exists())
-    {
+    if (!dir.exists()) {
         error = QObject::tr("Path does not exist");
         return false;
     }
-    if (!dir.exists("mcedit.sh") && !dir.exists("mcedit.py") && !dir.exists("mcedit.exe") && !dir.exists("Contents") && !dir.exists("mcedit2.exe"))
-    {
+    if (!dir.exists("mcedit.sh") && !dir.exists("mcedit.py") && !dir.exists("mcedit.exe") && !dir.exists("Contents") &&
+        !dir.exists("mcedit2.exe")) {
         error = QObject::tr("Path does not seem to be a MCEdit path");
         return false;
     }
@@ -53,22 +51,16 @@ QString MCEditTool::getProgramPath()
     const QString mceditPath = path();
     QDir mceditDir(mceditPath);
 #if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
-    if (mceditDir.exists("mcedit.sh"))
-    {
+    if (mceditDir.exists("mcedit.sh")) {
         return mceditDir.absoluteFilePath("mcedit.sh");
-    }
-    else if (mceditDir.exists("mcedit.py"))
-    {
+    } else if (mceditDir.exists("mcedit.py")) {
         return mceditDir.absoluteFilePath("mcedit.py");
     }
     return QString();
 #elif defined(Q_OS_WIN32)
-    if (mceditDir.exists("mcedit.exe"))
-    {
+    if (mceditDir.exists("mcedit.exe")) {
         return mceditDir.absoluteFilePath("mcedit.exe");
-    }
-    else if (mceditDir.exists("mcedit2.exe"))
-    {
+    } else if (mceditDir.exists("mcedit2.exe")) {
         return mceditDir.absoluteFilePath("mcedit2.exe");
     }
     return QString();