diff options
author | William Wilgus <wilgus.william@gmail.com> | 2022-12-14 03:06:04 -0500 |
---|---|---|
committer | William Wilgus <wilgus.william@gmail.com> | 2022-12-14 22:35:33 -0500 |
commit | 6b87bfadfff6c44722f8ffe5227c05c41b1b47c8 (patch) | |
tree | a0f346c8cde95c33d0561977a064cc438841923e /apps/root_menu.c | |
parent | eaf717744d425e0bb8905f451e7443b07b67f97b (diff) | |
download | rockbox-6b87bfadfff6c44722f8ffe5227c05c41b1b47c8.tar.gz rockbox-6b87bfadfff6c44722f8ffe5227c05c41b1b47c8.zip |
wps.c cleanup gui_show_wps
remove some old cruft move a few things around clean-up flow
Change-Id: I138c6cd9e2d58ef526eb686333da413819df725d
Diffstat (limited to 'apps/root_menu.c')
-rw-r--r-- | apps/root_menu.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/apps/root_menu.c b/apps/root_menu.c index 6008c87eda..89afae8c25 100644 --- a/apps/root_menu.c +++ b/apps/root_menu.c | |||
@@ -280,9 +280,9 @@ static int browser(void* param) | |||
280 | if (ret_val == GO_TO_WPS | 280 | if (ret_val == GO_TO_WPS |
281 | || ret_val == GO_TO_PREVIOUS_MUSIC | 281 | || ret_val == GO_TO_PREVIOUS_MUSIC |
282 | || ret_val == GO_TO_PLUGIN) | 282 | || ret_val == GO_TO_PLUGIN) |
283 | pop_current_activity(ACTIVITY_REFRESH_DEFERRED); | 283 | pop_current_activity_without_refresh(); |
284 | else | 284 | else |
285 | pop_current_activity(ACTIVITY_REFRESH_NOW); | 285 | pop_current_activity(); |
286 | 286 | ||
287 | switch ((intptr_t)param) | 287 | switch ((intptr_t)param) |
288 | { | 288 | { |
@@ -355,10 +355,10 @@ static int wpsscrn(void* param) | |||
355 | || last_screen == GO_TO_SYSTEM_SCREEN | 355 | || last_screen == GO_TO_SYSTEM_SCREEN |
356 | || last_screen == GO_TO_PLAYLISTS_SCREEN))) | 356 | || last_screen == GO_TO_PLAYLISTS_SCREEN))) |
357 | { | 357 | { |
358 | pop_current_activity(ACTIVITY_REFRESH_DEFERRED); | 358 | pop_current_activity_without_refresh(); |
359 | } | 359 | } |
360 | else | 360 | else |
361 | pop_current_activity(ACTIVITY_REFRESH_NOW); | 361 | pop_current_activity(); |
362 | 362 | ||
363 | return ret_val; | 363 | return ret_val; |
364 | } | 364 | } |
@@ -396,10 +396,10 @@ static int playlist_view_catalog(void * param) | |||
396 | 396 | ||
397 | if (item_was_selected) | 397 | if (item_was_selected) |
398 | { | 398 | { |
399 | pop_current_activity(ACTIVITY_REFRESH_DEFERRED); | 399 | pop_current_activity_without_refresh(); |
400 | return GO_TO_WPS; | 400 | return GO_TO_WPS; |
401 | } | 401 | } |
402 | pop_current_activity(ACTIVITY_REFRESH_NOW); | 402 | pop_current_activity(); |
403 | return GO_TO_ROOT; | 403 | return GO_TO_ROOT; |
404 | } | 404 | } |
405 | 405 | ||
@@ -714,10 +714,10 @@ static inline int load_screen(int screen) | |||
714 | || ret_val == GO_TO_PREVIOUS_BROWSER | 714 | || ret_val == GO_TO_PREVIOUS_BROWSER |
715 | || ret_val == GO_TO_FILEBROWSER) | 715 | || ret_val == GO_TO_FILEBROWSER) |
716 | { | 716 | { |
717 | pop_current_activity(ACTIVITY_REFRESH_DEFERRED); | 717 | pop_current_activity_without_refresh(); |
718 | } | 718 | } |
719 | else | 719 | else |
720 | pop_current_activity(ACTIVITY_REFRESH_NOW); | 720 | pop_current_activity(); |
721 | } | 721 | } |
722 | 722 | ||
723 | last_screen = screen; | 723 | last_screen = screen; |
@@ -744,7 +744,7 @@ static int load_context_screen(int selection) | |||
744 | 744 | ||
745 | if (context_menu) | 745 | if (context_menu) |
746 | retval = do_menu(context_menu, NULL, NULL, false); | 746 | retval = do_menu(context_menu, NULL, NULL, false); |
747 | pop_current_activity(ACTIVITY_REFRESH_NOW); | 747 | pop_current_activity(); |
748 | return retval; | 748 | return retval; |
749 | } | 749 | } |
750 | 750 | ||
@@ -992,7 +992,7 @@ void root_menu(void) | |||
992 | 992 | ||
993 | push_activity_without_refresh(ACTIVITY_UNKNOWN); /* prevent plugin_load */ | 993 | push_activity_without_refresh(ACTIVITY_UNKNOWN); /* prevent plugin_load */ |
994 | next_screen = load_plugin_screen(key); /* from flashing root */ | 994 | next_screen = load_plugin_screen(key); /* from flashing root */ |
995 | pop_current_activity(ACTIVITY_REFRESH_DEFERRED); /* menu activity */ | 995 | pop_current_activity_without_refresh(); /* menu activity */ |
996 | 996 | ||
997 | if (next_screen == GO_TO_PREVIOUS) | 997 | if (next_screen == GO_TO_PREVIOUS) |
998 | { | 998 | { |