diff options
| author | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-07-05 01:04:08 +0000 |
|---|---|---|
| committer | SND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2013-07-05 01:04:08 +0000 |
| commit | 98d7380ec7887a091c62d9d860815c70b0edffe8 (patch) | |
| tree | dfd92ac07aea30311dfe7af632a0a5c49662a981 /macosx/PcsxrMemoryObject.m | |
| parent | b05c91bb3b900edee49546451a0eecf54988a3b7 (diff) | |
| download | pcsxr-98d7380ec7887a091c62d9d860815c70b0edffe8.tar.gz | |
Making the SIO plug-ins work on OS X.
Setting the deployment target on the SIO plug-in be set to 10.7, since we don't we have a 10.6 version of PCSXR that can use it.
Adding Xcode config files.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@85826 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/PcsxrMemoryObject.m')
| -rwxr-xr-x | macosx/PcsxrMemoryObject.m | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/macosx/PcsxrMemoryObject.m b/macosx/PcsxrMemoryObject.m index e85145b2..4d740b30 100755 --- a/macosx/PcsxrMemoryObject.m +++ b/macosx/PcsxrMemoryObject.m @@ -123,15 +123,17 @@ NSString *const memoryAnimateTimerKey = @"PCSXR Memory Card Image Animate"; return; } //This is the only setter that is being watched AND changed. - [self willChangeValueForKey:@"memImage"]; #if __has_feature(objc_arc) + [self willChangeValueForKey:@"memImage"]; memImage = theMemImage; + [self didChangeValueForKey:@"memImage"]; #else NSImage *tmpImage = memImage; + [self willChangeValueForKey:@"memImage"]; memImage = [theMemImage retain]; + [self didChangeValueForKey:@"memImage"]; [tmpImage release]; #endif - [self didChangeValueForKey:@"memImage"]; } - (NSImage*)memImage { |