Merge pull request #3258 from sronsse/fixes_for_team

task content: Display OSD loading message prior to loading content
This commit is contained in:
Twinaphex 2016-07-23 03:17:15 +02:00 committed by GitHub
commit af9b9411d2

View File

@ -1607,9 +1607,6 @@ static bool task_load_content(content_ctx_info_t *content_info,
} }
#endif #endif
if (!content_load(content_info))
goto error;
if (launched_from_menu) if (launched_from_menu)
{ {
/** Show loading OSD message */ /** Show loading OSD message */
@ -1622,6 +1619,9 @@ static bool task_load_content(content_ctx_info_t *content_info,
} }
} }
if (!content_load(content_info))
goto error;
/* Push entry to top of history playlist */ /* Push entry to top of history playlist */
if (content_is_inited() || content_does_not_need_content()) if (content_is_inited() || content_does_not_need_content())
{ {