summaryrefslogtreecommitdiff
path: root/macosx/main.m
diff options
context:
space:
mode:
authorSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2014-04-02 18:01:28 +0000
committerSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2014-04-02 18:01:28 +0000
commitebc8e55d33f011d9c44a5c76f463c99950f0e973 (patch)
tree715e11e8bff5125725a1600efbf3a4912b958a82 /macosx/main.m
parent761714b617e99eaa5009ccf73e637367c41e3bb2 (diff)
downloadpcsxr-ebc8e55d33f011d9c44a5c76f463c99950f0e973.tar.gz
OS X:
Stop the memory card images from animating when the preferences window closes. Other changes and improvements. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@89782 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/main.m')
-rwxr-xr-xmacosx/main.m4
1 files changed, 2 insertions, 2 deletions
diff --git a/macosx/main.m b/macosx/main.m
index ab98a87d..d8c2e14c 100755
--- a/macosx/main.m
+++ b/macosx/main.m
@@ -114,7 +114,7 @@ int SysInit()
if (![logFolderURL checkResourceIsReachableAndReturnError:NULL])
[manager createDirectoryAtPath:[logFolderURL path] withIntermediateDirectories:YES attributes:nil error:NULL];
//We use the log extension so that OS X's console app can open it by default.
- NSURL *logFileURL = [logFolderURL URLByAppendingPathComponent:@"emuLog.log"];
+ NSURL *logFileURL = [logFolderURL URLByAppendingPathComponent:@"PCSX-R emuLog.log"];
emuLog = fopen([[logFileURL path] fileSystemRepresentation], "wb");
#else
@@ -154,8 +154,8 @@ void SysReset()
static void AddStringToLogList(NSString *themsg)
{
static NSMutableString *theStr;
- NSRange newlineRange, fullLineRange;
static dispatch_once_t onceToken;
+ NSRange newlineRange, fullLineRange;
dispatch_once(&onceToken, ^{
theStr = [[NSMutableString alloc] init];
});