diff options
-rw-r--r-- | apps/bookmark.c | 4 | ||||
-rw-r--r-- | apps/bookmark.h | 2 | ||||
-rw-r--r-- | apps/gui/wps.c | 2 | ||||
-rw-r--r-- | apps/misc.c | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/apps/bookmark.c b/apps/bookmark.c index 85570839be..dd800f75c0 100644 --- a/apps/bookmark.c +++ b/apps/bookmark.c | |||
@@ -159,7 +159,7 @@ bool bookmark_mrb_load() | |||
159 | /* This function handles an autobookmark creation. This is an interface */ | 159 | /* This function handles an autobookmark creation. This is an interface */ |
160 | /* function. */ | 160 | /* function. */ |
161 | /* ----------------------------------------------------------------------- */ | 161 | /* ----------------------------------------------------------------------- */ |
162 | bool bookmark_autobookmark(void) | 162 | bool bookmark_autobookmark(bool prompt_ok) |
163 | { | 163 | { |
164 | char* bookmark; | 164 | char* bookmark; |
165 | if (!system_check()) | 165 | if (!system_check()) |
@@ -192,7 +192,7 @@ bool bookmark_autobookmark(void) | |||
192 | const struct text_message message={lines, 2}; | 192 | const struct text_message message={lines, 2}; |
193 | #endif | 193 | #endif |
194 | 194 | ||
195 | if(gui_syncyesno_run(&message, NULL, NULL)==YESNO_YES) | 195 | if(prompt_ok && gui_syncyesno_run(&message, NULL, NULL)==YESNO_YES) |
196 | { | 196 | { |
197 | if (global_settings.autocreatebookmark == BOOKMARK_RECENT_ONLY_ASK) | 197 | if (global_settings.autocreatebookmark == BOOKMARK_RECENT_ONLY_ASK) |
198 | return write_bookmark(false, bookmark); | 198 | return write_bookmark(false, bookmark); |
diff --git a/apps/bookmark.h b/apps/bookmark.h index e8770f5c4e..bde8e84697 100644 --- a/apps/bookmark.h +++ b/apps/bookmark.h | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <stdbool.h> | 24 | #include <stdbool.h> |
25 | 25 | ||
26 | bool bookmark_load_menu(void); | 26 | bool bookmark_load_menu(void); |
27 | bool bookmark_autobookmark(void); | 27 | bool bookmark_autobookmark(bool prompt_ok); |
28 | bool bookmark_create_menu(void); | 28 | bool bookmark_create_menu(void); |
29 | bool bookmark_mrb_load(void); | 29 | bool bookmark_mrb_load(void); |
30 | bool bookmark_autoload(const char* file); | 30 | bool bookmark_autoload(const char* file); |
diff --git a/apps/gui/wps.c b/apps/gui/wps.c index e2a7dcb961..b6a42769fe 100644 --- a/apps/gui/wps.c +++ b/apps/gui/wps.c | |||
@@ -1258,7 +1258,7 @@ long gui_wps_show(void) | |||
1258 | fade(false, true); | 1258 | fade(false, true); |
1259 | 1259 | ||
1260 | if (bookmark) | 1260 | if (bookmark) |
1261 | bookmark_autobookmark(); | 1261 | bookmark_autobookmark(true); |
1262 | audio_stop(); | 1262 | audio_stop(); |
1263 | #ifdef AB_REPEAT_ENABLE | 1263 | #ifdef AB_REPEAT_ENABLE |
1264 | ab_reset_markers(); | 1264 | ab_reset_markers(); |
diff --git a/apps/misc.c b/apps/misc.c index 554d29e630..f9c6116205 100644 --- a/apps/misc.c +++ b/apps/misc.c | |||
@@ -291,7 +291,7 @@ static bool clean_shutdown(void (*callback)(void *), void *parameter) | |||
291 | #ifdef SIMULATOR | 291 | #ifdef SIMULATOR |
292 | (void)callback; | 292 | (void)callback; |
293 | (void)parameter; | 293 | (void)parameter; |
294 | bookmark_autobookmark(); | 294 | bookmark_autobookmark(false); |
295 | call_storage_idle_notifys(true); | 295 | call_storage_idle_notifys(true); |
296 | exit(0); | 296 | exit(0); |
297 | #else | 297 | #else |
@@ -356,7 +356,7 @@ static bool clean_shutdown(void (*callback)(void *), void *parameter) | |||
356 | sleep(1); | 356 | sleep(1); |
357 | } | 357 | } |
358 | #endif | 358 | #endif |
359 | bookmark_autobookmark(); | 359 | bookmark_autobookmark(false); |
360 | 360 | ||
361 | /* audio_stop_recording == audio_stop for HWCODEC */ | 361 | /* audio_stop_recording == audio_stop for HWCODEC */ |
362 | audio_stop(); | 362 | audio_stop(); |
@@ -420,7 +420,7 @@ bool list_stop_handler(void) | |||
420 | { | 420 | { |
421 | if (global_settings.fade_on_stop) | 421 | if (global_settings.fade_on_stop) |
422 | fade(false, false); | 422 | fade(false, false); |
423 | bookmark_autobookmark(); | 423 | bookmark_autobookmark(true); |
424 | audio_stop(); | 424 | audio_stop(); |
425 | ret = true; /* bookmarking can make a refresh necessary */ | 425 | ret = true; /* bookmarking can make a refresh necessary */ |
426 | } | 426 | } |