Skip to content

Commit 1d2cdb2

Browse files
committed
clarify some exception messages
1 parent 6ef8e0d commit 1d2cdb2

6 files changed

Lines changed: 35 additions & 34 deletions

File tree

FlashpointSecurePlayer/EnvironmentVariables.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ private string GetValue(EnvironmentVariablesElement environmentVariablesElement)
143143

144144
if (comparableName != null) {
145145
if (UnmodifiableComparableNames.Contains(comparableName, StringComparer.OrdinalIgnoreCase)) {
146-
throw new InvalidEnvironmentVariablesException("The \"" + environmentVariablesElement.Name + "\" Environment Variable cannot be modified while creating the Active Environment Variables Element.");
146+
throw new InvalidEnvironmentVariablesException("The \"" + environmentVariablesElement.Name + "\" Environment Variable could not be modified while creating the Active Environment Variables Element.");
147147
}
148148
}
149149

@@ -179,7 +179,7 @@ private string GetValue(EnvironmentVariablesElement environmentVariablesElement)
179179

180180
if (comparableName != null) {
181181
if (UnmodifiableComparableNames.Contains(comparableName, StringComparer.OrdinalIgnoreCase)) {
182-
throw new InvalidEnvironmentVariablesException("The \"" + environmentVariablesElement.Name + "\" Environment Variable cannot be modified at this time.");
182+
throw new InvalidEnvironmentVariablesException("The \"" + environmentVariablesElement.Name + "\" Environment Variable could not be modified at this time.");
183183
}
184184
}
185185

@@ -310,7 +310,7 @@ public void Deactivate(MODIFICATIONS_REVERT_METHOD modificationsRevertMethod = M
310310

311311
if (comparableName != null) {
312312
if (UnmodifiableComparableNames.Contains(comparableName, StringComparer.OrdinalIgnoreCase)) {
313-
throw new InvalidEnvironmentVariablesException("The \"" + activeEnvironmentVariablesElement.Name + "\" Environment Variable cannot be modified at this time.");
313+
throw new InvalidEnvironmentVariablesException("The \"" + activeEnvironmentVariablesElement.Name + "\" Environment Variable could not be modified at this time.");
314314
}
315315
}
316316

FlashpointSecurePlayer/FlashpointSecurePlayerGUI.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public FlashpointSecurePlayerGUI() {
7070
// multiple instances open, blow up immediately
7171
applicationMutex.Close();
7272
applicationMutex = null;
73-
throw new InvalidOperationException("You cannot run multiple instances of Flashpoint Secure Player.");
73+
throw new InvalidOperationException("You must not run multiple instances of Flashpoint Secure Player.");
7474
}
7575
} catch (InvalidOperationException ex) {
7676
LogExceptionToLauncher(ex);

FlashpointSecurePlayer/Properties/Resources.Designer.cs

Lines changed: 2 additions & 2 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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,13 +218,13 @@ If you choose No, the application will exit.</value>
218218
<value>The process is unable to start.</value>
219219
</data>
220220
<data name="RegistryStateAlreadyInProgress" xml:space="preserve">
221-
<value>The Registry State cannot be started because another one has already been started.</value>
221+
<value>The Registry State could not be started because another one has already been started.</value>
222222
</data>
223223
<data name="RegistryStateInProgress" xml:space="preserve">
224224
<value>The Registry State is being created. Please do not turn off your computer.</value>
225225
</data>
226226
<data name="RegistryStateNotInProgress" xml:space="preserve">
227-
<value>The Registry State cannot be stopped because no Registry State has been started.</value>
227+
<value>The Registry State could not be stopped because no Registry State has been started.</value>
228228
</data>
229229
<data name="RegistryStateTimeout" xml:space="preserve">
230230
<value>The Registry State timed out.</value>

FlashpointSecurePlayer/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ There are four possible scenarios.
275275

276276
In scenarios one and two, Flashpoint Secure Player reverts the active Registry States Modification because the software is no longer open. In scenario three, Flashpoint Secure Player reverts the active Registry States Modification and any software opened using Software Mode is killed. In scenario four, Flashpoint Secure Player will revert the active Registry States Modification whenever the application is next run, regardless of what Modes or Modifications are specified.
277277

278-
If the Registry States Modification cannot be reverted, an error occurs and the application will exit, and not do anything else regardless of what Modes or Modifications are specified until the issue is resolved. If the registry has been modified by a different application outside of Flashpoint Secure Player, the player no longer assumes control of those registry keys and values, and the active Registry States Modification is silently discarded.
278+
If the Registry States Modification could not be reverted, an error occurs and the application will exit, and not do anything else regardless of what Modes or Modifications are specified until the issue is resolved. If the registry has been modified by a different application outside of Flashpoint Secure Player, the player no longer assumes control of those registry keys and values, and the active Registry States Modification is silently discarded.
279279

280280
**Administrator User**
281281

0 commit comments

Comments
 (0)