summaryrefslogtreecommitdiff
path: root/macosx/main.m
diff options
context:
space:
mode:
authorSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2012-12-15 21:07:55 +0000
committerSND\MaddTheSane_cp <SND\MaddTheSane_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2012-12-15 21:07:55 +0000
commitbe3d963074ee8adf5da0371761e090488b3681d3 (patch)
tree24ac0f45405136899584fe3ef2c022c148bfb352 /macosx/main.m
parentc0cba1977a8cac317af37c3004c53417fbce31bc (diff)
downloadpcsxr-be3d963074ee8adf5da0371761e090488b3681d3.tar.gz
Mac Patch 13437.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@81770 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'macosx/main.m')
-rw-r--r--macosx/main.m4
1 files changed, 4 insertions, 0 deletions
diff --git a/macosx/main.m b/macosx/main.m
index 9cf60eb3..2508b21e 100644
--- a/macosx/main.m
+++ b/macosx/main.m
@@ -14,6 +14,7 @@
#include "psxcommon.h"
#include "sio.h"
#import <IOKit/pwr_mgt/IOPMLib.h>
+#import "hotkeys.h"
static BOOL sysInited = NO;
//#define EMU_LOG
@@ -76,6 +77,8 @@ int SysInit() {
if (success != kIOReturnSuccess) {
NSLog(@"Unable to stop sleep, error code %d", success);
}
+
+ attachHotkeys();
return 0;
}
@@ -164,6 +167,7 @@ void SysClose() {
if (emuLog != NULL) fclose(emuLog);
sysInited = NO;
+ detachHotkeys();
}
void OnFile_Exit() {