Skip to content

Commit 54fada5

Browse files
authored
YesNoCancel isn't a thing for CustomMessageBox
1 parent 6636ad6 commit 54fada5

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

MPF.ExecutionContexts.Test/RedumperTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void DefaultValueTest(RedumpSystem? system,
7070
[Theory]
7171
[InlineData("disc -h --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
7272
[InlineData("disc --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=path --image-name=image --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext")]
73-
public void CDTest(string parameters)
73+
public void DiscTest(string parameters)
7474
{
7575
string? expected = "disc --help --version --verbose --auto-eject --drive=dr --speed=0 --retries=0 --image-path=\"path\" --image-name=\"image\" --overwrite --drive-type=dt --drive-read-offset=0 --drive-c2-shift=0 --drive-pregap-start=0 --drive-read-method=drm --drive-sector-order=dso --plextor-skip-leadin --plextor-leadin-retries=0 --asus-skip-leadout --force-offset=0 --audio-silence-threshold=0 --correct-offset-shift --offset-shift-relocate --force-split --leave-unchanged --force-qtoc --skip-fill=0 --iso9660-trim --lba-start=0 --lba-end=0 --refine-subchannel --skip=0 --dump-write-offset=0 --dump-read-size=0 --overread-leadout --force-unscrambled --legacy-subs --disable-cdtext";
7676
var context = new ExecutionContext(parameters);

MPF.Frontend/ViewModels/MainViewModel.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2173,17 +2173,16 @@ public async void StartDumping()
21732173
// If still in custom parameter mode, check that users meant to continue or not
21742174
if (ParametersCheckBoxEnabled == false && _displayUserMessage != null)
21752175
{
2176-
bool? result = _displayUserMessage("Custom Changes", "It looks like you have custom parameters that have not been saved. Would you like to apply those changes before starting to dump?", 3, true);
2176+
bool? result = _displayUserMessage("Custom Changes", "It looks like you have custom parameters that have not been saved. Would you like to dump with these custom parameters?", 2, true);
21772177
if (result == true)
21782178
{
21792179
ParametersCheckBoxEnabled = true;
21802180
ProcessCustomParameters();
21812181
}
2182-
else if (result == null)
2182+
else
21832183
{
21842184
return;
21852185
}
2186-
// If false, then we continue with the current known environment
21872186
}
21882187

21892188
try

MPF.UI/Windows/WindowBase.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ public void TitleMouseDown(object sender, MouseButtonEventArgs e)
5656
{
5757
1 => MessageBoxButton.OK,
5858
2 => MessageBoxButton.YesNo,
59-
3 => MessageBoxButton.YesNoCancel,
6059

6160
// This should not happen, but default to "OK"
6261
_ => MessageBoxButton.OK,

0 commit comments

Comments
 (0)