ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "(OSX) use beginWithCompletionHandler - fixes 'OK' case" 

This reverts commit 8b1b14e818.
This commit is contained in:
Twinaphex 2016-01-13 19:07:57 +01:00
parent 8b1b14e818
commit a2580d3ec2
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/drivers/ui_cocoa.m
View File

@ -297,8 +297,10 @@ extern void action_ok_push_quick_menu(void);
NSString *startdir = BOXSTRING(settings->libretro_directory); NSString *startdir = BOXSTRING(settings->libretro_directory);
[panel setMessage:BOXSTRING("Load Core")]; [panel setMessage:BOXSTRING("Load Core")];
[panel setDirectoryURL:[NSURL fileURLWithPath:startdir]]; [panel setDirectoryURL:[NSURL fileURLWithPath:startdir]];
[panel beginWithCompletionHandler:^(NSInteger result) [panel beginSheetModalForWindow:self.window completionHandler:^(NSInteger result)
{ {
[[NSApplication sharedApplication] stopModal];
switch (result) switch (result)
{ {
case NSOKButton: case NSOKButton:
@ -330,8 +332,8 @@ extern void action_ok_push_quick_menu(void);
}]; }];
#else #else
[panel beginSheetForDirectory:nil file:nil modalForWindopw:[self window] modalDelegate:self didEndSelector:@selector(didEndSaveSheet:returnCode:contextInfo:) contextInfo:NULL]; [panel beginSheetForDirectory:nil file:nil modalForWindopw:[self window] modalDelegate:self didEndSelector:@selector(didEndSaveSheet:returnCode:contextInfo:) contextInfo:NULL];
[[NSApplication sharedApplication] runModalForWindow:panel];
#endif #endif
[[NSApplication sharedApplication] runModalForWindow:panel];
} }
- (void)openDocument:(id)sender - (void)openDocument:(id)sender
@ -344,8 +346,10 @@ extern void action_ok_push_quick_menu(void);
startdir = BOXSTRING("/"); startdir = BOXSTRING("/");
[panel setDirectoryURL:[NSURL fileURLWithPath:startdir]]; [panel setDirectoryURL:[NSURL fileURLWithPath:startdir]];
[panel setMessage:BOXSTRING("Load Content")]; [panel setMessage:BOXSTRING("Load Content")];
[panel beginWithCompletionHandler:^(NSInteger result) [panel beginSheetModalForWindow:self.window completionHandler:^(NSInteger result)
{ {
[[NSApplication sharedApplication] stopModal];
switch (result) switch (result)
{ {
case NSOKButton: case NSOKButton:
@ -373,8 +377,8 @@ extern void action_ok_push_quick_menu(void);
}]; }];
#else #else
[panel beginSheetForDirectory:nil file:nil modalForWindopw:[self window] modalDelegate:self didEndSelector:@selector(didEndSaveSheet:returnCode:contextInfo:) contextInfo:NULL]; [panel beginSheetForDirectory:nil file:nil modalForWindopw:[self window] modalDelegate:self didEndSelector:@selector(didEndSaveSheet:returnCode:contextInfo:) contextInfo:NULL];
[[NSApplication sharedApplication] runModalForWindow:panel];
#endif #endif
[[NSApplication sharedApplication] runModalForWindow:panel];
} }
- (void)unloadingCore - (void)unloadingCore