Cleanup

Supernature2k · May 27, 2017 · 11576f1 · 11576f1
1 parent 08bed1b
commit 11576f1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/command.c b/command.c
@@ -2372,9 +2372,6 @@ bool command_event(enum event_command cmd, void *data)
          command_event(CMD_EVENT_REMOTE_DEINIT, NULL);
          input_driver_init_remote();
          break;
-      case CMD_EVENT_TEMPORARY_CONTENT_DEINIT:
-         content_deinit();
-         break;
       case CMD_EVENT_LOG_FILE_DEINIT:
          retro_main_log_file_deinit();
          break;

diff --git a/command.h b/command.h
@@ -195,8 +195,6 @@ enum event_command
    CMD_EVENT_AUDIO_REINIT,
    /* Resizes windowed scale. Will reinitialize video driver. */
    CMD_EVENT_RESIZE_WINDOWED_SCALE,
-   /* Deinitializes temporary content. */
-   CMD_EVENT_TEMPORARY_CONTENT_DEINIT,
    CMD_EVENT_LOG_FILE_DEINIT,
    /* Toggles disk eject. */
    CMD_EVENT_DISK_EJECT_TOGGLE,

diff --git a/retroarch.c b/retroarch.c
@@ -296,7 +296,8 @@ static void retroarch_override_setting_free_state(void)
 static void global_free(void)
 {
    global_t *global = NULL;
-   command_event(CMD_EVENT_TEMPORARY_CONTENT_DEINIT, NULL);
+
+   content_deinit();
 
    path_deinit_subsystem();
    command_event(CMD_EVENT_RECORD_DEINIT, NULL);
@@ -1445,7 +1446,7 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
 
          command_event(CMD_EVENT_CORE_DEINIT, NULL);
 
-         command_event(CMD_EVENT_TEMPORARY_CONTENT_DEINIT, NULL);
+         content_deinit();
 
          path_deinit_subsystem();
          path_deinit_savefile();