(task_load_content) Cleanups

This commit is contained in:
twinaphex 2016-12-21 00:06:34 +01:00
parent 7914dda336
commit c13639147e

View File

@ -978,33 +978,33 @@ static bool task_load_content(content_ctx_info_t *content_info,
path_resolve_realpath(tmp, sizeof(tmp)); path_resolve_realpath(tmp, sizeof(tmp));
} }
if (info && *tmp) if (info && !string_is_empty(tmp))
{ {
const char *core_path = NULL; const char *core_path = NULL;
const char *core_name = NULL; const char *core_name = NULL;
playlist_t *playlist_tmp = g_defaults.content_history; playlist_t *playlist_tmp = g_defaults.content_history;
switch (path_is_media_type(tmp)) switch (path_is_media_type(tmp))
{ {
case RARCH_CONTENT_MOVIE: case RARCH_CONTENT_MOVIE:
#ifdef HAVE_FFMPEG #ifdef HAVE_FFMPEG
playlist_tmp = g_defaults.video_history; playlist_tmp = g_defaults.video_history;
core_name = "movieplayer"; core_name = "movieplayer";
core_path = "builtin"; core_path = "builtin";
#endif #endif
break; break;
case RARCH_CONTENT_MUSIC: case RARCH_CONTENT_MUSIC:
#ifdef HAVE_FFMPEG #ifdef HAVE_FFMPEG
playlist_tmp = g_defaults.music_history; playlist_tmp = g_defaults.music_history;
core_name = "musicplayer"; core_name = "musicplayer";
core_path = "builtin"; core_path = "builtin";
#endif #endif
break; break;
case RARCH_CONTENT_IMAGE: case RARCH_CONTENT_IMAGE:
#ifdef HAVE_IMAGEVIEWER #ifdef HAVE_IMAGEVIEWER
playlist_tmp = g_defaults.image_history; playlist_tmp = g_defaults.image_history;
core_name = "imageviewer"; core_name = "imageviewer";
core_path = "builtin"; core_path = "builtin";
#endif #endif
break; break;
default: default:
@ -1324,7 +1324,6 @@ bool task_push_content_load_default(
break; break;
} }
RARCH_LOG("MODE: %d\n", mode);
/* Load content */ /* Load content */
switch (mode) switch (mode)
{ {