empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updates from upstream.

Browse source 
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
This commit is contained in:
Andrea Odetti 2021-07-15 18:54:58 +01:00
parent 7ae208a2e5
commit cd0a18de1d
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
source/frontends/common2/programoptions.cpp
View file

@ -210,20 +210,31 @@ namespace common2
{ {
g_nMemoryClearType = options.memclear; g_nMemoryClearType = options.memclear;
bool disksOk = true; LPSTR szImageName_drive[NUM_DRIVES];
if (!options.disk1.empty()) bool driveConnected[NUM_DRIVES];
if (options.disk1.empty())
{ {
const bool ok = DoDiskInsert(SLOT6, DRIVE_1, options.disk1.c_str()); driveConnected[DRIVE_1] = false;
disksOk = disksOk && ok; }
LogFileOutput("Init: DoDiskInsert(D1), res=%d\n", ok); else
{
driveConnected[DRIVE_1] = true;
szImageName_drive[DRIVE_2] = const_cast<char *>(options.disk1.c_str());
} }
if (!options.disk2.empty()) if (options.disk2.empty())
{ {
const bool ok = DoDiskInsert(SLOT6, DRIVE_2, options.disk2.c_str()); driveConnected[DRIVE_2] = false;
disksOk = disksOk && ok;
LogFileOutput("Init: DoDiskInsert(D2), res=%d\n", ok);
} }
else
{
driveConnected[DRIVE_2] = true;
szImageName_drive[DRIVE_2] = const_cast<char *>(options.disk2.c_str());
}
bool bBoot;
InsertFloppyDisks(SLOT6, szImageName_drive, driveConnected, bBoot);
if (!options.snapshotFilename.empty()) if (!options.snapshotFilename.empty())
{ {