From d553bb1149800daf16dcb92bc0608fe6248e1dab Mon Sep 17 00:00:00 2001 From: William Wilgus Date: Tue, 28 Jul 2020 10:58:34 -0400 Subject: root_menu move tag cache init check to pictureflow plugin let pictureflow decide if the tag cache is ready instead of core Change-Id: I2ab9b375d773dbbc28ea41fbf7bb6fb361ace8fd --- apps/root_menu.c | 40 +++++++++++++--------------------------- 1 file changed, 13 insertions(+), 27 deletions(-) (limited to 'apps/root_menu.c') diff --git a/apps/root_menu.c b/apps/root_menu.c index 9ff7325ce1..c59c39fe88 100644 --- a/apps/root_menu.c +++ b/apps/root_menu.c @@ -704,7 +704,7 @@ static int load_context_screen(int selection) } #ifdef HAVE_PICTUREFLOW_INTEGRATION -static int load_plugin_screen(char *plug_path) +static int load_plugin_screen(char *plug_path, void* plug_param) { int ret_val; int old_previous = last_screen; @@ -712,7 +712,7 @@ static int load_plugin_screen(char *plug_path) global_status.last_screen = (char)next_screen; status_save(); - switch (plugin_load(plug_path, NULL)) + switch (plugin_load(plug_path, plug_param)) { case PLUGIN_GOTO_WPS: ret_val = GO_TO_WPS; @@ -729,20 +729,6 @@ static int load_plugin_screen(char *plug_path) last_screen = (old_previous == next_screen) ? GO_TO_ROOT : old_previous; return ret_val; } - -static bool check_database(void) -{ - bool needwarn = true; - while ( !tagcache_is_usable() ) - { - if (needwarn) - splash(0, ID2P(LANG_TAGCACHE_BUSY)); - if ( action_userabort(HZ/5) ) - return false; - needwarn = false; - } - return true; -} #endif void root_menu(void) @@ -823,18 +809,18 @@ void root_menu(void) break; #ifdef HAVE_PICTUREFLOW_INTEGRATION case GO_TO_PICTUREFLOW: - if (check_database()) - { - char pf_path[MAX_PATH]; - snprintf(pf_path, sizeof(pf_path), - "%s/pictureflow.rock", - PLUGIN_DEMOS_DIR); - next_screen = load_plugin_screen(pf_path); - previous_browser = (next_screen != GO_TO_WPS) ? GO_TO_FILEBROWSER : GO_TO_PICTUREFLOW; - } - else - next_screen = GO_TO_PREVIOUS; + { + char pf_path[MAX_PATH]; + char activity[6];/* big enough to display int */ + snprintf(activity, sizeof(activity), "%d", get_current_activity()); + snprintf(pf_path, sizeof(pf_path), + "%s/pictureflow.rock", + PLUGIN_DEMOS_DIR); + + next_screen = load_plugin_screen(pf_path, &activity); + previous_browser = (next_screen != GO_TO_WPS) ? GO_TO_FILEBROWSER : GO_TO_PICTUREFLOW; break; + } #endif default: #ifdef HAVE_TAGCACHE -- cgit v1.2.3