Minor fix for path and update channel switching

Moonif · Feb 10, 2024 · 0585fd7 · 0585fd7
1 parent 572784f
commit 0585fd7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/MacBox/ViewControllers/MainViewController.swift b/MacBox/ViewControllers/MainViewController.swift
@@ -259,7 +259,7 @@ class MainViewController: NSViewController {
     }
 
     // Check if 86Box is installed, and check for updated version
-    func checkFor86Box(url: URL? = nil, appVer: String? = nil, buildVer: String? = nil) {
+    func checkFor86Box(url: URL? = nil, appVer: String? = nil, buildVer: String? = nil, ignoreVersionCheck: Bool = false) {
         var localUrl: URL?
 
         if let url = url {
@@ -288,7 +288,7 @@ class MainViewController: NSViewController {
                 localUrl = versionInfoObject.emulatorCustomUrl
             }
 
-            if let localUrl = localUrl {
+            if let localUrl = localUrl, !ignoreVersionCheck {
                 // Get 86Box info.plist
                 if let bundle = Bundle(url: localUrl) {
                     // Get the 86Box short version

diff --git a/MacBox/ViewControllers/SettingsViewController.swift b/MacBox/ViewControllers/SettingsViewController.swift
@@ -125,7 +125,7 @@ class SettingsViewController: NSViewController {
                                 setEmulatorPathTextField(text: emulatorCustomPathString ?? "-")
                                 // Update version status in MainVC
                                 MainViewController.instance.versionInfoObject.emulatorCustomUrl = appURL
-                                MainViewController.instance.checkFor86Box()
+                                MainViewController.instance.checkFor86Box(url: nil, appVer: nil, buildVer: nil, ignoreVersionCheck: true)
                             }
                             else {
                                 // Not 86Box; Reset selection
@@ -148,7 +148,7 @@ class SettingsViewController: NSViewController {
                 emulatorCustomPathString = nil
                 // Update version status in MainVC
                 MainViewController.instance.versionInfoObject.emulatorCustomUrl = nil
-                MainViewController.instance.checkFor86Box()
+                MainViewController.instance.checkFor86Box(url: nil, appVer: nil, buildVer: nil, ignoreVersionCheck: true)
             }
         }
     }
@@ -169,7 +169,7 @@ class SettingsViewController: NSViewController {
 
             // Update version status in MainVC
             MainViewController.instance.versionInfoObject.emulatorUpdateChannel = updateChannelStr
-            MainViewController.instance.checkFor86Box()
+            MainViewController.instance.checkFor86Box(url: nil, appVer: nil, buildVer: nil, ignoreVersionCheck: true)
         }
     }
 }