mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix CONTENT_MODE_LOAD_CONTENT_WITH_CURRENT_CORE_FROM_COMPANION_UI

Browse Source
This commit is contained in:
Twinaphex 2016-05-17 09:14:18 +02:00
parent fcf2decb2e
commit 52937d4b02
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tasks/task_content.c
View File

@ -1976,6 +1976,7 @@ bool rarch_task_push_content_load_default(
case CONTENT_MODE_LOAD_CONTENT_WITH_FFMPEG_CORE_FROM_MENU: case CONTENT_MODE_LOAD_CONTENT_WITH_FFMPEG_CORE_FROM_MENU:
case CONTENT_MODE_LOAD_CONTENT_WITH_CURRENT_CORE_FROM_MENU: case CONTENT_MODE_LOAD_CONTENT_WITH_CURRENT_CORE_FROM_MENU:
case CONTENT_MODE_LOAD_CONTENT_WITH_IMAGEVIEWER_CORE_FROM_MENU: case CONTENT_MODE_LOAD_CONTENT_WITH_IMAGEVIEWER_CORE_FROM_MENU:
case CONTENT_MODE_LOAD_CONTENT_WITH_CURRENT_CORE_FROM_COMPANION_UI:
content_info->environ_get = menu_content_environment_get; content_info->environ_get = menu_content_environment_get;
break; break;
default: default:
@ -2023,10 +2024,6 @@ bool rarch_task_push_content_load_default(
core_path = settings->path.libretro; core_path = settings->path.libretro;
runloop_ctl(RUNLOOP_CTL_SET_CONTENT_PATH, (void*)fullpath); runloop_ctl(RUNLOOP_CTL_SET_CONTENT_PATH, (void*)fullpath);
runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, (void*)core_path); runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, (void*)core_path);
#ifdef HAVE_MENU
if (!content_load_wrapper(content_info, true))
goto error;
#endif
#ifdef HAVE_MENU #ifdef HAVE_MENU
if (!content_load_wrapper(content_info, true)) if (!content_load_wrapper(content_info, true))
goto error; goto error;

6
ui/drivers/ui_cocoa.m
View File

@ -409,9 +409,6 @@ static void open_document_handler(NSOpenPanel *panel, NSInteger result)
- (void)openDocument:(id)sender - (void)openDocument:(id)sender
{ {
#ifdef HAVE_OPENGL
NSOpenGLContext *glc = (NSOpenGLContext*)glcontext_get_ptr();
#endif
NSOpenPanel* panel = (NSOpenPanel*)[NSOpenPanel openPanel]; NSOpenPanel* panel = (NSOpenPanel*)[NSOpenPanel openPanel];
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
NSString *startdir = BOXSTRING(settings->directory.menu_content); NSString *startdir = BOXSTRING(settings->directory.menu_content);
@ -438,9 +435,6 @@ static void open_document_handler(NSOpenPanel *panel, NSInteger result)
if (result == 1) if (result == 1)
open_document_handler(panel, result); open_document_handler(panel, result);
#endif #endif
#ifdef HAVE_OPENGL
[glc makeCurrentContext];
#endif
} }
- (void)unloadingCore - (void)unloadingCore