Merge pull request #3209 from lakkatv/master

(Menu) Don't push the quick menu on playlists
This commit is contained in:
Twinaphex 2016-07-11 15:03:12 +02:00 committed by GitHub
commit daee8afa19

View File

@ -1931,6 +1931,8 @@ bool task_push_content_load_default(
case CONTENT_MODE_LOAD_CONTENT_FROM_PLAYLIST_FROM_MENU:
case CONTENT_MODE_LOAD_NOTHING_WITH_NEW_CORE_FROM_MENU:
break;
case CONTENT_MODE_LOAD_CONTENT_FROM_PLAYLIST_FROM_MENU:
break;
default:
#ifdef HAVE_MENU
if (type != CORE_TYPE_DUMMY && mode != CONTENT_MODE_LOAD_FROM_CLI)