Merge pull request #12 from WumboSpasm/master

tomysshadow · web-flow · commit 5752fd262ddd · 2023-07-29T22:46:17.000-06:00
Display error message when opening second instance
diff --git a/FlashpointSecurePlayer/FlashpointSecurePlayerGUI.cs b/FlashpointSecurePlayer/FlashpointSecurePlayerGUI.cs
@@ -76,6 +76,7 @@ public FlashpointSecurePlayerGUI() {
                 LogExceptionToLauncher(ex);
             } finally {
                 if (!createdNew) {
+                    MessageBox.Show(Properties.Resources.NoMultipleInstances, Properties.Resources.FlashpointSecurePlayer, MessageBoxButtons.OK, MessageBoxIcon.Error);
                     Environment.Exit(-2);
                 }
             }
diff --git a/FlashpointSecurePlayer/Properties/Resources.Designer.cs b/FlashpointSecurePlayer/Properties/Resources.Designer.cs
diff --git a/FlashpointSecurePlayer/Properties/Resources.resx b/FlashpointSecurePlayer/Properties/Resources.resx
@@ -190,6 +190,9 @@ If you choose No, the application will exit.</value>
   <data name="NoModeSelected" xml:space="preserve">
     <value>No mode was selected.</value>
   </data>
+  <data name="NoMultipleInstances" xml:space="preserve">
+    <value>You cannot run multiple instances of Flashpoint Secure Player.</value>
+  </data>
   <data name="OCS_CPUSpeedNotDetermined" xml:space="preserve">
     <value>The CPU's clock speed could not be determined.</value>
   </data>

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@ public FlashpointSecurePlayerGUI() {`
`76`	`76`	`LogExceptionToLauncher(ex);`
`77`	`77`	`} finally {`
`78`	`78`	`if (!createdNew) {`
	`79`	`+ MessageBox.Show(Properties.Resources.NoMultipleInstances, Properties.Resources.FlashpointSecurePlayer, MessageBoxButtons.OK, MessageBoxIcon.Error);`
`79`	`80`	`Environment.Exit(-2);`
`80`	`81`	`}`
`81`	`82`	`}`