fix restart exceptions

Author: tomysshadow

FlashpointSecurePlayer/FlashpointSecurePlayerGUI.cs

@@ -243,7 +243,7 @@ private void RestartApplication(bool runAsAdministrator, ref Mutex applicationMu
                 LogExceptionToLauncher(ex);
                 Show();
                 ShowErrorFatal(Properties.Resources.ProcessUnableToStart);
-                throw new Exceptions.ApplicationRestartRequiredException("The application failed to restart.");
+                throw new ApplicationRestartRequiredException("The application failed to restart.");
             }
         }
 
@@ -280,11 +280,16 @@ the program to enter an infinite restart loop
 
                     RestartApplication(true, ref applicationMutex);
                 }
+            } catch (InvalidModificationException ex) {
+                // abort the operation
+                LogExceptionToLauncher(ex);
+                throw;
             } catch (Exception ex) {
+                // failed to restart
                 LogExceptionToLauncher(ex);
             }
 
-            // we're already running as admin?
+            // we're already running as admin or failed to restart
             ShowError(String.Format(Properties.Resources.GameUnableToLaunch, Properties.Resources.AsAdministratorUser));
             throw new InvalidModificationException("The Modification failed to run as Administrator User.");
         }
@@ -294,7 +299,12 @@ private void AskLaunchWithCompatibilitySettings() {
                 AskLaunch(Properties.Resources.WithCompatibilitySettings);
 
                 RestartApplication(false, ref applicationMutex);
+            } catch (InvalidModificationException ex) {
+                // abort the operation
+                LogExceptionToLauncher(ex);
+                throw;
             } catch (Exception ex) {
+                // failed to restart
                 LogExceptionToLauncher(ex);
             }
 
@@ -360,7 +370,12 @@ private void AskLaunchWithOldCPUSimulator() {
                 HideWindow(ref processStartInfo);
 
                 RestartApplication(false, ref applicationMutex, processStartInfo);
+            } catch (InvalidModificationException ex) {
+                // abort the operation
+                LogExceptionToLauncher(ex);
+                throw;
             } catch (Exception ex) {
+                // failed to restart
                 LogExceptionToLauncher(ex);
             }