Merge pull request #2457 from heuripedes/master

(command_event) Fix crash on unload content
This commit is contained in:
Twinaphex 2015-11-24 14:35:37 +01:00
commit 39907adf17
2 changed files with 3 additions and 11 deletions

View File

@ -1206,7 +1206,7 @@ bool event_command(enum event_command cmd)
if (menu)
menu->load_no_content = false;
#endif
rarch_main_data_deinit();
rarch_main_data_clear_state();
rarch_main_ctl(RARCH_MAIN_CTL_CLEAR_CONTENT_PATH, NULL);

View File

@ -621,17 +621,9 @@ static void rarch_task_overlay_handler(rarch_task_t *task)
case OVERLAY_STATUS_DEFERRED_LOADING_RESOLVE:
rarch_task_overlay_resolve_iterate(loader);
break;
case OVERLAY_STATUS_DEFERRED_DONE:
#if 0
input_overlay_new_done();
break;
#endif
case OVERLAY_STATUS_DEFERRED_ERROR:
#if 0
input_overlay_free();
break;
#endif
break;
task->error = strdup("Failed to load the overlay.");
case OVERLAY_STATUS_DEFERRED_DONE:
default:
case OVERLAY_STATUS_NONE:
goto task_finished;