summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/bookmark.c5
-rw-r--r--apps/root_menu.c2
-rw-r--r--apps/root_menu.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/apps/bookmark.c b/apps/bookmark.c
index a86e2a6504..b5c0e4a148 100644
--- a/apps/bookmark.c
+++ b/apps/bookmark.c
@@ -501,6 +501,11 @@ static char* select_bookmark(const char* bookmark_file_name)
#endif
bookmark_count = get_bookmark_count(bookmark_file_name);
+ if (bookmark_count < 1) /* error opening file, or empty file */
+ {
+ gui_syncsplash(HZ, str(LANG_BOOKMARK_LOAD_EMPTY));
+ return NULL;
+ }
action_signalscreenchange();
while(true)
{
diff --git a/apps/root_menu.c b/apps/root_menu.c
index c9abd662db..1fc330941c 100644
--- a/apps/root_menu.c
+++ b/apps/root_menu.c
@@ -457,7 +457,7 @@ void root_menu(void)
)
previous_browser = next_screen;
if (next_screen == GO_TO_WPS
-#ifdef CONFIG_TUNER
+#if CONFIG_TUNER
|| next_screen == GO_TO_FM
#endif
)
diff --git a/apps/root_menu.h b/apps/root_menu.h
index 5e411a5eae..ee82357103 100644
--- a/apps/root_menu.h
+++ b/apps/root_menu.h
@@ -38,7 +38,7 @@ enum {
#ifdef HAVE_RECORDING
GO_TO_RECSCREEN,
#endif
-#ifdef CONFIG_TUNER
+#if CONFIG_TUNER
GO_TO_FM,
#endif
GO_TO_RECENTBMARKS,