diff --git a/apps/root_menu.c b/apps/root_menu.c index 7f882cdba3..0f2e38e395 100644 --- a/apps/root_menu.c +++ b/apps/root_menu.c @@ -558,9 +558,19 @@ static int load_plugin_screen(char *plug_path) global_status.last_screen = (char)next_screen; status_save(); - ret_val = plugin_load(plug_path, NULL); - if (ret_val == PLUGIN_OK) + switch (plugin_load(plug_path, NULL)) + { + case PLUGIN_GOTO_WPS: + ret_val = GO_TO_WPS; + break; + case PLUGIN_OK: ret_val = audio_status() ? GO_TO_PREVIOUS : GO_TO_ROOT; + break; + default: + ret_val = GO_TO_PREVIOUS; + break; + } + if (ret_val == GO_TO_PREVIOUS) last_screen = (old_previous == next_screen) ? GO_TO_ROOT : old_previous; return ret_val;