From 346d7128d86d91d31e68b04c4c07fdc1ac11a84b Mon Sep 17 00:00:00 2001
From: Aaron Culliney <devnull@deadc0de.org>
Date: Thu, 22 Nov 2018 10:14:46 -0800
Subject: [PATCH] Fix some issues around disk loading preferences on macOS

---
 Apple2Mac/Classes/OSX/EmulatorDiskController.m | 10 +++-------
 Apple2Mac/Classes/OSX/EmulatorGLView.m         |  1 +
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Apple2Mac/Classes/OSX/EmulatorDiskController.m b/Apple2Mac/Classes/OSX/EmulatorDiskController.m
index 6d91a3d5..006e03ef 100644
--- a/Apple2Mac/Classes/OSX/EmulatorDiskController.m
+++ b/Apple2Mac/Classes/OSX/EmulatorDiskController.m
@@ -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];
         }
     }
     
diff --git a/Apple2Mac/Classes/OSX/EmulatorGLView.m b/Apple2Mac/Classes/OSX/EmulatorGLView.m
index 29c80dac..02f7f32b 100644
--- a/Apple2Mac/Classes/OSX/EmulatorGLView.m
+++ b/Apple2Mac/Classes/OSX/EmulatorGLView.m
@@ -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;