Skip to content

Commit 8bfcbd2

Browse files
committed
minor tweaks
1 parent 0fcf27e commit 8bfcbd2

8 files changed

Lines changed: 54 additions & 50 deletions

File tree

FlashpointSecurePlayer/FlashpointProxy.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,9 @@ private static void GetSystemProxy(ref INTERNET_PER_CONN_OPTION_LIST internetPer
127127
if (!result) {
128128
throw new FlashpointProxyException("Could not query the Internet Options.");
129129
}
130-
} catch (Exception ex) {
130+
} catch {
131131
Marshal.FreeCoTaskMem(internetPerConnOptionList.pOptions);
132-
throw ex;
132+
throw;
133133
}
134134
}
135135

FlashpointSecurePlayer/FlashpointSecurePlayerGUI.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -630,19 +630,19 @@ private void ActivateMode(TemplateElement templateElement, ErrorDelegate errorDe
630630
}
631631
632632
if (!String.IsNullOrEmpty(lastSoftwareProcessStandardError)) {
633-
MessageBox.Show(lastSoftwareProcessStandardError);
633+
MessageBox.Show(lastSoftwareProcessStandardError, Properties.Resources.OldCPUSimulator, MessageBoxButtons.OK, MessageBoxIcon.Error);
634634
}
635635
}
636636
break;
637637
*/
638638
case -2:
639-
MessageBox.Show(Properties.Resources.OCS_NoMultipleInstances);
639+
MessageBox.Show(Properties.Resources.OCS_NoMultipleInstances, Properties.Resources.OldCPUSimulator, MessageBoxButtons.OK, MessageBoxIcon.Error);
640640
break;
641641
case -3:
642-
MessageBox.Show(Properties.Resources.OCS_CPUSpeedNotDetermined);
642+
MessageBox.Show(Properties.Resources.OCS_CPUSpeedNotDetermined, Properties.Resources.OldCPUSimulator, MessageBoxButtons.OK, MessageBoxIcon.Error);
643643
break;
644644
default:
645-
MessageBox.Show(Properties.Resources.OCS_OldCPUNotSimulated);
645+
MessageBox.Show(Properties.Resources.OCS_OldCPUNotSimulated, Properties.Resources.OldCPUSimulator, MessageBoxButtons.OK, MessageBoxIcon.Error);
646646
break;
647647
}
648648
}
@@ -895,7 +895,7 @@ private async Task ActivateModificationsAsync(TemplateElement templateElement, E
895895
singleInstance.Activate(TemplateName);
896896
} catch (InvalidModificationException ex) {
897897
LogExceptionToLauncher(ex);
898-
throw ex;
898+
throw;
899899
} catch (TaskRequiresElevationException ex) {
900900
LogExceptionToLauncher(ex);
901901
AskLaunchAsAdministratorUser();

FlashpointSecurePlayer/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
// You can specify all the values or you can default the Build and Revision Numbers
3434
// by using the '*' as shown below:
3535
// [assembly: AssemblyVersion("1.0.*")]
36-
[assembly: AssemblyVersion("2.1.7.0")]
37-
[assembly: AssemblyFileVersion("2.1.7.0")]
36+
[assembly: AssemblyVersion("2.1.8.0")]
37+
[assembly: AssemblyFileVersion("2.1.8.0")]
3838
[assembly: NeutralResourcesLanguage("en")]
3939

FlashpointSecurePlayer/Properties/Resources.Designer.cs

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

FlashpointSecurePlayer/Properties/Resources.resx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,9 @@ If you choose No, the application will exit.</value>
207207
<data name="OCS_OldCPUNotSimulated" xml:space="preserve">
208208
<value>The old CPU could not be simulated.</value>
209209
</data>
210+
<data name="OldCPUSimulator" xml:space="preserve">
211+
<value>Old CPU Simulator</value>
212+
</data>
210213
<data name="OldCPUSimulatorFailed" xml:space="preserve">
211214
<value>The Old CPU Simulator failed. The Target Rate may be invalid.</value>
212215
</data>

FlashpointSecurePlayer/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Flashpoint Secure Player 2.1.7
1+
# Flashpoint Secure Player 2.1.8
22
This player attempts to solve common compatibility or portability issues posed by browser plugins on Windows for the purpose of playback in BlueMaxima's Flashpoint.
33

44
It is compatible with Windows 7, Windows 8, Windows 8.1 and Windows 10, and requires .NET Framework 4.5. If you are on Windows 8.1 or Windows 10, or if you are on Windows 7/8 and have updates enabled, you already have .NET Framework 4.5. Otherwise, you may [download .NET Framework 4.5.](http://www.microsoft.com/en-us/download/details.aspx?id=30653)

FlashpointSecurePlayer/Shared.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2215,8 +2215,8 @@ public static async Task<Uri> DownloadAsync(string name) {
22152215
}
22162216
return httpResponseMessage.RequestMessage.RequestUri;
22172217
}
2218-
} catch (Exceptions.DownloadFailedException ex) {
2219-
throw ex;
2218+
} catch (Exceptions.DownloadFailedException) {
2219+
throw;
22202220
} catch (ArgumentException) {
22212221
throw new Exceptions.DownloadFailedException("The download failed because the download name (" + name + ") is invalid.");
22222222
} catch (HttpRequestException) {

FlashpointSecurePlayer/WebBrowserMode.Designer.cs

Lines changed: 30 additions & 38 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)