From 79c3eba93e64ac4067b3f23dbb43f0b2df1288b5 Mon Sep 17 00:00:00 2001 From: Kelvin Sherlock Date: Sat, 26 Feb 2022 15:52:13 -0500 Subject: [PATCH] software list items need to be *after* slot configuration so they have access to the 3.5" disk controller card, for example. --- Ample/LaunchWindowController.m | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Ample/LaunchWindowController.m b/Ample/LaunchWindowController.m index 04a99ed..767a0e6 100644 --- a/Ample/LaunchWindowController.m +++ b/Ample/LaunchWindowController.m @@ -459,11 +459,6 @@ static NSString *ShellQuote(NSString *s) { //[argv addObject: @"mame"]; [argv addObject: _machine]; - if (_software) { - NSString *name = [_softwareSet nameForSoftware: _software]; - if (name) [argv addObject: name]; - } - // -confirm_quit? [argv addObject: @"-skip_gameinfo"]; @@ -552,6 +547,12 @@ static NSString *ShellQuote(NSString *s) { [argv addObjectsFromArray: tmp]; } + // software *AFTER* slots so, eg, apple2ee has access to the superdrive. + if (_software) { + NSString *name = [_softwareSet nameForSoftware: _software]; + if (name) [argv addObject: name]; + } + if (_mameSpeed < 0) { [argv addObject: @"-nothrottle"]; } else if (_mameSpeed > 1) {