mirror of https://github.com/ksherlock/ample.git
software list items need to be *after* slot configuration so they have access to the 3.5" disk controller card, for example.
This commit is contained in:
parent
e09a151c91
commit
79c3eba93e
|
@ -459,11 +459,6 @@ static NSString *ShellQuote(NSString *s) {
|
||||||
//[argv addObject: @"mame"];
|
//[argv addObject: @"mame"];
|
||||||
[argv addObject: _machine];
|
[argv addObject: _machine];
|
||||||
|
|
||||||
if (_software) {
|
|
||||||
NSString *name = [_softwareSet nameForSoftware: _software];
|
|
||||||
if (name) [argv addObject: name];
|
|
||||||
}
|
|
||||||
|
|
||||||
// -confirm_quit?
|
// -confirm_quit?
|
||||||
[argv addObject: @"-skip_gameinfo"];
|
[argv addObject: @"-skip_gameinfo"];
|
||||||
|
|
||||||
|
@ -552,6 +547,12 @@ static NSString *ShellQuote(NSString *s) {
|
||||||
[argv addObjectsFromArray: tmp];
|
[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) {
|
if (_mameSpeed < 0) {
|
||||||
[argv addObject: @"-nothrottle"];
|
[argv addObject: @"-nothrottle"];
|
||||||
} else if (_mameSpeed > 1) {
|
} else if (_mameSpeed > 1) {
|
||||||
|
|
Loading…
Reference in New Issue