From bcfa783100529ffbd29c6f0a7a9275c27df5cf66 Mon Sep 17 00:00:00 2001 From: Osborne Jacobs Date: Fri, 2 Mar 2012 22:34:14 -0500 Subject: [PATCH] Set %cs(Current Screen) to "Bookmark browser" when listing bookmarks from the Context Menu Currently when you select list bookmarks from the context menu %cs returns "Context Menu" when in the bookmark browser screen. This change makes %cs return "Bookmark browser" when listing bookmarks from the context menu, the same as when you list recent bookmarks. This change will make it possible to determin that you are on a bookmark browser screen when skinning using an sbs file. Change-Id: I7fb93525fbafb5d14bba2ae5df7a78df908d09ae Reviewed-on: http://gerrit.rockbox.org/169 Reviewed-by: Jonathan Gordon --- apps/bookmark.c | 8 ++++++-- docs/CREDITS | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/bookmark.c b/apps/bookmark.c index 82a23fbbc9..cce8ef88bf 100644 --- a/apps/bookmark.c +++ b/apps/bookmark.c @@ -125,6 +125,9 @@ bool bookmark_create_menu(void) /* ----------------------------------------------------------------------- */ bool bookmark_load_menu(void) { + bool ret = false; + + push_current_activity(ACTIVITY_BOOKMARKSLIST); if (is_bookmarkable_state()) { char* name = playlist_get_name(NULL, global_temp_buffer, @@ -135,12 +138,13 @@ bool bookmark_load_menu(void) if (bookmark != NULL) { - return play_bookmark(bookmark); + ret = play_bookmark(bookmark); } } } - return false; + pop_current_activity(); + return ret; } /* ----------------------------------------------------------------------- */ diff --git a/docs/CREDITS b/docs/CREDITS index e59054df8a..3619b6aea8 100644 --- a/docs/CREDITS +++ b/docs/CREDITS @@ -620,6 +620,7 @@ Cástor Muñoz Albert Barca Fukuda Takafumi Dimitar Dimitrov +Osborne Jacobs The libmad team The wavpack team