make league auto-detecting optional

LeagueToolkit · Jul 21, 2023 · 431d65e · 431d65e
1 parent 7052de3
commit 431d65e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/src/CSLOLToolsImpl.cpp b/src/CSLOLToolsImpl.cpp
@@ -228,7 +228,7 @@ void CSLOLToolsImpl::doReportError(QString name, QString message, QString trace)
         logFile_->write(trace.toUtf8() + "\n");
     }
     if (message.contains("OpenProcess: ") || trace.contains("OpenProcess: ")) {
-        QFile file(prog_ + "/admin_allow.txt");
+        QFile file(prog_ + "/admin_allowed.txt");
         file.open(QIODevice::WriteOnly);
         file.close();
         trace += '\n';

diff --git a/src/CSLOLUtils.cpp b/src/CSLOLUtils.cpp
@@ -104,7 +104,7 @@ QString CSLOLUtils::detectGamePath() {
 
 bool CSLOLUtils::isUnnecessaryAdmin() {
     return false;
-    if (QFileInfo info(QCoreApplication::applicationDirPath() + "/admin_allow.txt"); info.exists()) {
+    if (QFileInfo info(QCoreApplication::applicationDirPath() + "/admin_allowed.txt"); info.exists()) {
         return false;
     }
     bool result = 0;

diff --git a/src/qml/CSLOLDialogSettings.qml b/src/qml/CSLOLDialogSettings.qml
@@ -19,6 +19,7 @@ Dialog {
     }
 
     property bool isBussy: false
+    property alias detectGamePath: detectGamePathCheck.checked
     property alias blacklist: blacklistCheck.checked
     property alias ignorebad: ignorebadCheck.checked
     property alias enableUpdates: enableUpdatesCheck.checkState
@@ -90,6 +91,12 @@ Dialog {
                     onClicked: cslolDialogSettings.changeGamePath()
                     Layout.fillWidth: true
                 }
+                Switch {
+                    id: detectGamePathCheck
+                    text: qsTr("Automatically detect game path")
+                    checked: true
+                    Layout.fillWidth: true
+                }
                 Switch {
                     id: blacklistCheck
                     text: qsTr("Blacklist extra gamemods")

diff --git a/src/qml/main.qml b/src/qml/main.qml
@@ -20,6 +20,7 @@ ApplicationWindow {
         id: settings
         property alias leaguePath: cslolTools.leaguePath
 
+        property alias detectGamePath: cslolDialogSettings.detectGamePath
         property alias blacklist: cslolDialogSettings.blacklist
         property alias ignorebad: cslolDialogSettings.ignorebad
         property alias suppressInstallConflicts: cslolDialogSettings.suppressInstallConflicts
@@ -55,7 +56,7 @@ ApplicationWindow {
     }
 
     function checkGamePath() {
-        let detected = CSLOLUtils.detectGamePath();
+        let detected = settings.detectGamePath ? CSLOLUtils.detectGamePath() : "";
         if (detected === "" && cslolTools.leaguePath === "") {
             cslolDialogGame.open();
             return false;