Fix availability of user action buttons

Author: witcher112

Assets/PatchKit Patcher/Scripts/Patcher.cs

@@ -564,12 +564,17 @@ private void ThreadWaitForUserDecision(CancellationToken cancellationToken)
 
                 DebugLogger.LogVariable(isInstalled, "isInstalled");
 
-                _canRepairApp.Value = false; // not implemented
-                _canInstallApp.Value = !isInstalled;
-                _canCheckForAppUpdates.Value = isInstalled;
-                _canStartApp.Value = isInstalled;
+                bool canRepairApp = false; // not implemented
+                bool canInstallApp = !isInstalled;
+                bool canCheckForAppUpdates = isInstalled;
+                bool canStartApp = isInstalled;
 
-                if (_canInstallApp.Value && _configuration.AutomaticallyInstallApp && !_hasAutomaticallyInstalledApp)
+                _canRepairApp.Value = false;
+                _canInstallApp.Value = false;
+                _canCheckForAppUpdates.Value = false;
+                _canStartApp.Value = false;
+
+                if (canInstallApp && _configuration.AutomaticallyInstallApp && !_hasAutomaticallyInstalledApp)
                 {
                     DebugLogger.Log("Automatically deciding to install app.");
                     _hasAutomaticallyInstalledApp = true;
@@ -578,7 +583,7 @@ private void ThreadWaitForUserDecision(CancellationToken cancellationToken)
                     return;
                 }
 
-                if (_canCheckForAppUpdates.Value && _configuration.AutomaticallyCheckForAppUpdates &&
+                if (canCheckForAppUpdates && _configuration.AutomaticallyCheckForAppUpdates &&
                     !_hasAutomaticallyCheckedForAppUpdate)
                 {
                     DebugLogger.Log("Automatically deciding to check for app updates.");
@@ -588,20 +593,31 @@ private void ThreadWaitForUserDecision(CancellationToken cancellationToken)
                     return;
                 }
 
-                if (_canStartApp.Value && _configuration.AutomaticallyStartApp && !_hasAutomaticallyStartedApp)
+                if (canStartApp && _configuration.AutomaticallyStartApp && !_hasAutomaticallyStartedApp)
                 {
                     DebugLogger.Log("Automatically deciding to start app.");
                     _hasAutomaticallyStartedApp = true;
                     _userDecision = UserDecision.StartAppAutomatically;
                     return;
                 }
 
+                _canRepairApp.Value = canRepairApp;
+                _canInstallApp.Value = canInstallApp;
+                _canCheckForAppUpdates.Value = canCheckForAppUpdates;
+                _canStartApp.Value = canStartApp;
+
                 _userDecisionSetEvent.Reset();
                 using (cancellationToken.Register(() => _userDecisionSetEvent.Set()))
                 {
                     cancellationToken.ThrowIfCancellationRequested();
                     _userDecisionSetEvent.WaitOne();
                 }
+
+                _canRepairApp.Value = false;
+                _canInstallApp.Value = false;
+                _canCheckForAppUpdates.Value = false;
+                _canStartApp.Value = false;
+
                 cancellationToken.ThrowIfCancellationRequested();
 
                 DebugLogger.Log(string.Format("Waiting for user decision result: {0}.", _userDecision));

CHANGELOG.md

@@ -36,6 +36,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Pre update integrity checking uses the Repair strategy
 
 ### Fixed
+- Availability of user action buttons (update, start & check for updates)
 - Handling of the ZLib exception
 - Invalid handling of patcher-data-location argument with spaces