summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2011-12-08 03:20:28 +0000
committerSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2011-12-08 03:20:28 +0000
commit7bbdf20d981c5fc8691e95bf0da2f71158058c97 (patch)
treeeb6313c439504d166dde377306d5a0252d12b1ca
parentef551a9d0e9920b742743f4f50d1a80536fb6606 (diff)
downloadpcsxr-7bbdf20d981c5fc8691e95bf0da2f71158058c97.tar.gz
Let's make sure the memory card is created before posting a notification about it.
Declare "_MACOSX" on the XGL plug-in. git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@72996 e17a0e51-4ae3-4d35-97c3-1a29b211df97
-rw-r--r--macosx/ConfigurationController.m7
-rw-r--r--macosx/plugins/PeopsXgl/PeopsXGL.xcodeproj/project.pbxproj2
2 files changed, 7 insertions, 2 deletions
diff --git a/macosx/ConfigurationController.m b/macosx/ConfigurationController.m
index a89775e3..4460e396 100644
--- a/macosx/ConfigurationController.m
+++ b/macosx/ConfigurationController.m
@@ -99,10 +99,13 @@ NSString *memChangeNotifier = @"PcsxrMemoryCardDidChangeNotifier";
if ([openDlg runModal] == NSFileHandlingPanelOKButton) {
NSString *mcdPath = [[openDlg URL] path];
+
+ //Workaround/kludge to make sure we create a memory card before posting a notification
+ strcpy(mcd, [mcdPath fileSystemRepresentation]);
+
+ CreateMcd(mcd);
[ConfigurationController setMemoryCard:tag toPath:mcdPath];
-
- CreateMcd(mcd);
}
[openDlg release];
}
diff --git a/macosx/plugins/PeopsXgl/PeopsXGL.xcodeproj/project.pbxproj b/macosx/plugins/PeopsXgl/PeopsXGL.xcodeproj/project.pbxproj
index e983cd72..037ea76d 100644
--- a/macosx/plugins/PeopsXgl/PeopsXGL.xcodeproj/project.pbxproj
+++ b/macosx/plugins/PeopsXgl/PeopsXGL.xcodeproj/project.pbxproj
@@ -310,6 +310,7 @@
"PCSXRPLUG=PeopsXGL",
_MACGL,
_DARWIN,
+ "_MACOSX=1",
);
GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
GCC_WARN_UNKNOWN_PRAGMAS = NO;
@@ -342,6 +343,7 @@
"PCSXRPLUG=PeopsXGL",
_MACGL,
_DARWIN,
+ "_MACOSX=1",
);
GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
GCC_WARN_UNKNOWN_PRAGMAS = NO;