Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-06-26 00:29:27 +00:00
Code Issues Projects Releases Wiki Activity

Fix some issues around disk loading preferences on macOS

Browse Source
This commit is contained in:
Aaron Culliney 2018-11-22 10:14:46 -08:00
parent 0478afe60e
commit 346d7128d8
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Apple2Mac/Classes/OSX/EmulatorDiskController.m
View File

@ -83,7 +83,7 @@ static void prefsChangeCallback(const char *domain)
bool bVal = false;
BOOL readOnlyA = prefs_parseBoolValue(PREF_DOMAIN_VM, PREF_DISK_PATH_A_RO, &bVal) ? bVal : true;
if (startupDiskA)
if (startupDiskA && [startupDiskA length])
{
const char *path = [startupDiskA UTF8String];
int fdA = -1;
@ -110,7 +110,7 @@ static void prefsChangeCallback(const char *domain)
bool bVal = false;
BOOL readOnlyB = prefs_parseBoolValue(PREF_DOMAIN_VM, PREF_DISK_PATH_B_RO, &bVal) ? bVal : true;
if (startupDiskB)
if (startupDiskB && [startupDiskB length])
{
const char *path = [startupDiskB UTF8String];
int fdB = -1;
@ -156,7 +156,7 @@ static void prefsChangeCallback(const char *domain)
prefs_setBoolValue(PREF_DOMAIN_VM, PREF_DISK_PATH_B_RO, true);
}
prefs_sync(PREF_DOMAIN_VM);
//prefs_sync(PREF_DOMAIN_VM); -- do not sync here since that will trigger reload of startup disks
prefs_save();
}
@ -230,8 +230,6 @@ static void prefsChangeCallback(const char *domain)
if (isStartupDiskA)
{
[self.startupLoadDiskA setState:NSOnState];
//[self.diskAProtection setState:(readOnly ? NSOnState : NSOffState) atRow:0 column:0];
//[self.diskAProtection setState:(!readOnly ? NSOnState : NSOffState) atRow:0 column:1];
}
}
else
@ -250,8 +248,6 @@ static void prefsChangeCallback(const char *domain)
if (isStartupDiskB)
{
[self.startupLoadDiskB setState:NSOnState];
//[self.diskBProtection setState:(readOnly ? NSOnState : NSOffState) atRow:0 column:0];
//[self.diskBProtection setState:(!readOnly ? NSOnState : NSOffState) atRow:0 column:1];
}
}

1
Apple2Mac/Classes/OSX/EmulatorGLView.m
View File

@ -367,6 +367,7 @@ static CVReturn displayLinkCallback(CVDisplayLinkRef displayLink, const CVTimeSt
- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)application
{
cpu_pause();
prefs_save();
disk6_eject(0);
disk6_eject(1);
return NSTerminateNow;