From a9750234c93488889cf38cae1e31e5cc4354b107 Mon Sep 17 00:00:00 2001
From: rogerman <rogerman@users.sf.net>
Date: Wed, 24 Apr 2013 20:58:36 +0000
Subject: [PATCH] Cocoa Port: - Enable Speed Limit, Enable Auto Frame Skip, and
 Enable Cheats options now remember their states between app runs, instead of
 always being reset to enabled on startup.

---
 desmume/src/cocoa/DefaultUserPrefs.plist      | Bin 5187 -> 5306 bytes
 .../userinterface/EmuControllerDelegate.mm    |  12 +++++++++---
 .../src/cocoa/userinterface/appDelegate.mm    |  16 ++++++++++++++--
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/desmume/src/cocoa/DefaultUserPrefs.plist b/desmume/src/cocoa/DefaultUserPrefs.plist
index 7cac37dffee1bbb05babed7fb015e31e98bfe90c..2146924dbc1a472662cf63323f0b4839c71b6884 100644
GIT binary patch
delta 1871
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
KzW&=**#8FvfduXV

delta 1770
zcmX|>3v?CL6^8$PA7|#w^UMwAVcNtJP)vkG0TpryNeH0<5?jK<s39wuTez;6q~Trx
z5h9`@DuRsQ0|{U)2v&<k1Oyt26)=EGIyZn1h(Ik06x#}vqNS6|ZD+4Dd!7CL`#)=)
z*=ydv`GbDyl&1Rd^hjRbagqPLI;W)o!%>JJivPcgG0cr1$}k#Z;?;^c4JH&5Fwy0w
z;+o<FDMpW`r?0||o?PatgETS0%iLVy?(eG+y~c$a>O#!}OKQra^$|OXwzQq42D&A!
zBs{&TzIN8caA-zN<+R2bm66&=bb4`ZbBz!`pHNa$+Fbi!XhdVQAri8m^Jdz+yoc>J
z-}&p)Mm`v=uZ@Ho8!E@%HU8F`lF&op`$OYrHHGZe{uFzUKhK<8`HKlPm9rY|FAqhg
zHP+b|{kNy4RJvAmHAT_7aN}LkNK-U2vSDhtA!L`apuL+V+bda?eS}rz$Xw=J7M@Rq
zBy&Mrmfgz0qPDj5?*JSZ8JL8-QH6VOuRUHGJY*i8!3$W4wfH@@;*a<Uo%r0nuWNA{
zKad}%$e@&-3iWo^0J?(;ajNZrG>VcRieUz3Viq38Y&?QFn2Q!XY8y(5UC75KKNiD$
zJdP*uBo^Q)_fi+)X&1l7?+HBXU=g0fVl2V)SPDDdRT^04U^!mIOL!TtU<F={mj~D{
zD7^!%4pw0`*5Eb#2Cw6{33O5USzw)mH?STX@FsqTxA1lXO;Y;=Had6*o6v@Lu^I1S
zOC06eJJgiGHV5xxJ9c0v{(yGuN^~V@S%KXSKER*wA@(4Qz1WvP*=Evpd27(&U_TDv
zAU?(?_!Ng++NzZW{_Ma(3|%;kBRGoB5=ZsZQv+W(_!7r(9NqW|CvY<1_o$we`VIaW
z!?!qtvp9#p;XJ;>-|-JuFvu8c|ETv#`W_c>5tr~UTy_Wb-?$QI<C5^Bga6<vfrvch
zC11jHuaOmC4oM^vCk54{l9oW(W=g<xNRUMVN}^tL9VN$6uKk#cQXNX8>nWXnLO-Pp
z%1m?}H3uYT#i$SUr5ouc>PI(IHs#PQaoqEvd)pI5dLY-KJi3)`qk%Mt2Gi{c<4qzp
zaHm5<Xei}VkcLqK4Nn*=Rz`ABjEZRlmC#5krBNuRGVG(#c7fH*tdlW!e(fz*W(zL4
zGuWRBshp<Ld|E?0sFS{?tDbC6fv4It!}E-%)w9)e*mJ=vyxHDTZ<ROdecHRmyV2X>
z{fm$LGJUuC#`@}gi+vk>2YlVWD}LFZ>Cg91@;CSw_*?yN`8)kz`L8gG<*>o5oHemI
zY!%zewz2JOCu{kT?PdGeN34VGX9w6p_A&c}9b%o#VKLUlj<BQbGxj<Af_=%3vA;@F
zq?yuuX@RszS|Tl%UXoTytE9Ek8`68yZt0|SURLB@a+;hj_m^|!f$|V}j66l2C(oA`
z%8TW7@&>tG-Y<8_-SS!al6;w~yjKfP;WzLsekU*C6}*avcoUz^7x5+B=CAXOd^_LE
zJGsNZ=BN1?{(~YbNlK=Ytqf91mC;JMGFf>*i7NAyXO(5jI^|8}ZKYk=uXHIVlyk~u
zRaH$jpk}GL>QJ>*{iRx|hSaI*1L|ybfx1*}RoAO6@2Y#$4)vgVO#N29ppm9&8QKk6
zmNrN$)W&F&v?<!Jw3*s$ZLYRhTcNGhHfcMxcI}YnXot1a+V|R3UDcEIzWN<{z8=(v
z=>__5y+p6lL;A1vNA#z3TYptwt#8sd>m7QRenLN|Up9OOGg6IoBg4pTG4hR4W1LZK
zOfw!f<{I;irADi<-q>vHGCB>%h#5zWZ;T5jOwCL&)65*RznNzindRo)W}Vq+K5i~I
zUp8McSD3A4o7rx5n2y<Po-xmvR|N^5@C#X_iM}FF1jQ&(ChirJMXhKSbHzfjOsp2w
z>%=y(L$nJ=bc>4?S-O>K-DLH%23z@7&>ChHSi`MCtH>(0Mpz}*NUPK;vqoEEtg%+P
VRpI`4-N)m(mZ|z${@>dQ{}<Yy<njOj

diff --git a/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm b/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm
index 97e37a469..03f584dfa 100644
--- a/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm
+++ b/desmume/src/cocoa/userinterface/EmuControllerDelegate.mm
@@ -1037,8 +1037,8 @@
 {
 	CocoaDSCore *cdsCore = (CocoaDSCore *)[cdsCoreController content];
 	
-	[[NSUserDefaults standardUserDefaults] setInteger:[cdsCore slot1DeviceType] forKey:@"EmulationSLOT1_DeviceType"];
-	[[NSUserDefaults standardUserDefaults] setObject:[[cdsCore slot1R4URL] path] forKey:@"EmulationSLOT1_R4StoragePath"];
+	[[NSUserDefaults standardUserDefaults] setInteger:[cdsCore slot1DeviceType] forKey:@"EmulationSlot1_DeviceType"];
+	[[NSUserDefaults standardUserDefaults] setObject:[[cdsCore slot1R4URL] path] forKey:@"EmulationSlot1_R4StoragePath"];
 }
 
 - (IBAction) writeDefaultsSoundSettings:(id)sender
@@ -1226,11 +1226,13 @@
 	{
 		[cdsCore setIsSpeedLimitEnabled:NO];
 		[self setStatusText:NSSTRING_STATUS_SPEED_LIMIT_DISABLED];
+		[[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"CoreControl_EnableSpeedLimit"];
 	}
 	else
 	{
 		[cdsCore setIsSpeedLimitEnabled:YES];
 		[self setStatusText:NSSTRING_STATUS_SPEED_LIMIT_ENABLED];
+		[[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"CoreControl_EnableSpeedLimit"];
 	}
 }
 
@@ -1250,11 +1252,13 @@
 	{
 		[cdsCore setIsFrameSkipEnabled:NO];
 		[self setStatusText:NSSTRING_STATUS_AUTO_FRAME_SKIP_DISABLED];
+		[[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"CoreControl_EnableAutoFrameSkip"];
 	}
 	else
 	{
 		[cdsCore setIsFrameSkipEnabled:YES];
 		[self setStatusText:NSSTRING_STATUS_AUTO_FRAME_SKIP_ENABLED];
+		[[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"CoreControl_EnableAutoFrameSkip"];
 	}
 }
 
@@ -1274,11 +1278,13 @@
 	{
 		[cdsCore setIsCheatingEnabled:NO];
 		[self setStatusText:NSSTRING_STATUS_CHEATS_DISABLED];
+		[[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"CoreControl_EnableCheats"];
 	}
 	else
 	{
 		[cdsCore setIsCheatingEnabled:YES];
 		[self setStatusText:NSSTRING_STATUS_CHEATS_ENABLED];
+		[[NSUserDefaults standardUserDefaults] setBool:YES forKey:@"CoreControl_EnableCheats"];
 	}
 }
 
@@ -1860,7 +1866,7 @@
 		return;
 	}
 	
-	[[NSUserDefaults standardUserDefaults] setObject:[selectedDirURL path] forKey:@"EmulationSLOT1_R4StoragePath"];
+	[[NSUserDefaults standardUserDefaults] setObject:[selectedDirURL path] forKey:@"EmulationSlot1_R4StoragePath"];
 	
 	CocoaDSCore *cdsCore = (CocoaDSCore *)[cdsCoreController content];
 	[cdsCore setSlot1R4URL:selectedDirURL];
diff --git a/desmume/src/cocoa/userinterface/appDelegate.mm b/desmume/src/cocoa/userinterface/appDelegate.mm
index a7d5ca454..15dda2c8e 100644
--- a/desmume/src/cocoa/userinterface/appDelegate.mm
+++ b/desmume/src/cocoa/userinterface/appDelegate.mm
@@ -307,6 +307,13 @@
 
 - (void)applicationWillTerminate:(NSNotification *)notification
 {
+	CocoaDSCore *cdsCore = (CocoaDSCore *)[cdsCoreController content];
+	
+	// Save some settings to user defaults before app termination
+	[[NSUserDefaults standardUserDefaults] setBool:[cdsCore isSpeedLimitEnabled] forKey:@"CoreControl_EnableSpeedLimit"];
+	[[NSUserDefaults standardUserDefaults] setBool:[cdsCore isFrameSkipEnabled] forKey:@"CoreControl_EnableAutoFrameSkip"];
+	[[NSUserDefaults standardUserDefaults] setBool:[cdsCore isCheatingEnabled] forKey:@"CoreControl_EnableCheats"];
+	
 	[cdsCoreController setContent:nil];
 }
 
@@ -444,10 +451,15 @@
 	[cdsCore setMaxJITBlockSize:[[NSUserDefaults standardUserDefaults] integerForKey:@"Emulation_MaxJITBlockSize"]];
 	
 	// Set the SLOT-1 device settings per user preferences.
-	NSString *slot1R4Path = (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:@"EmulationSLOT1_R4StoragePath"];
-	[cdsCore setSlot1DeviceType:[[NSUserDefaults standardUserDefaults] integerForKey:@"EmulationSLOT1_DeviceType"]];
+	NSString *slot1R4Path = (NSString *)[[NSUserDefaults standardUserDefaults] objectForKey:@"EmulationSlot1_R4StoragePath"];
+	[cdsCore setSlot1DeviceType:[[NSUserDefaults standardUserDefaults] integerForKey:@"EmulationSlot1_DeviceType"]];
 	[cdsCore setSlot1R4URL:(slot1R4Path != nil) ? [NSURL fileURLWithPath:slot1R4Path] : nil];
 	
+	// Set the miscellaneous emulations settings per user preferences.
+	[cdsCore setIsSpeedLimitEnabled:[[NSUserDefaults standardUserDefaults] boolForKey:@"CoreControl_EnableSpeedLimit"]];
+	[cdsCore setIsFrameSkipEnabled:[[NSUserDefaults standardUserDefaults] boolForKey:@"CoreControl_EnableAutoFrameSkip"]];
+	[cdsCore setIsCheatingEnabled:[[NSUserDefaults standardUserDefaults] boolForKey:@"CoreControl_EnableCheats"]];
+	
 	// Set up the firmware per user preferences.
 	NSMutableDictionary *newFWDict = [NSMutableDictionary dictionaryWithObjectsAndKeys:
 									  [[NSUserDefaults standardUserDefaults] objectForKey:@"FirmwareConfig_Nickname"], @"Nickname",