diff options
Diffstat (limited to 'apps/plugins/text_viewer')
| -rw-r--r-- | apps/plugins/text_viewer/text_viewer.c | 13 | ||||
| -rw-r--r-- | apps/plugins/text_viewer/tv_action.c | 4 | ||||
| -rw-r--r-- | apps/plugins/text_viewer/tv_action.h | 5 |
3 files changed, 8 insertions, 14 deletions
diff --git a/apps/plugins/text_viewer/text_viewer.c b/apps/plugins/text_viewer/text_viewer.c index eae8521..5d06d4b 100644 --- a/apps/plugins/text_viewer/text_viewer.c +++ b/apps/plugins/text_viewer/text_viewer.c @@ -21,11 +21,12 @@ * ****************************************************************************/ #include "plugin.h" +#include "lib/pluginlib_exit.h" #include "tv_action.h" #include "tv_button.h" #include "tv_preferences.h" -PLUGIN_HEADER + enum plugin_status plugin_start(const void* file) { @@ -56,6 +57,7 @@ enum plugin_status plugin_start(const void* file) return PLUGIN_ERROR; } + atexit(tv_exit); while (!done) { #ifdef HAVE_LCD_BITMAP if (rb->global_settings->statusbar != STATUSBAR_OFF && preferences->statusbar) @@ -79,12 +81,12 @@ enum plugin_status plugin_start(const void* file) if (res != TV_MENU_RESULT_EXIT_MENU) { - tv_exit(NULL); - done = true; if (res == TV_MENU_RESULT_ATTACHED_USB) return PLUGIN_USB_CONNECTED; else if (res == TV_MENU_RESULT_ERROR) return PLUGIN_ERROR; + else + done = true; } } break; @@ -195,7 +197,6 @@ enum plugin_status plugin_start(const void* file) #ifdef TV_QUIT2 case TV_QUIT2: #endif - tv_exit(NULL); done = true; break; @@ -204,9 +205,7 @@ enum plugin_status plugin_start(const void* file) break; default: - if (rb->default_event_handler_ex(button, tv_exit, NULL) - == SYS_USB_CONNECTED) - return PLUGIN_USB_CONNECTED; + exit_on_usb(button); display_update = false; break; } diff --git a/apps/plugins/text_viewer/tv_action.c b/apps/plugins/text_viewer/tv_action.c index c95ece0..1e5473b 100644 --- a/apps/plugins/text_viewer/tv_action.c +++ b/apps/plugins/text_viewer/tv_action.c @@ -47,10 +47,8 @@ static void tv_finalize_action(void) tv_finalize_window(); } -void tv_exit(void *parameter) +void tv_exit(void) { - (void)parameter; - /* save preference and bookmarks */ if (!tv_save_settings()) rb->splash(HZ, "Can't save preferences and bookmarks"); diff --git a/apps/plugins/text_viewer/tv_action.h b/apps/plugins/text_viewer/tv_action.h index fba008d..5b3571d 100644 --- a/apps/plugins/text_viewer/tv_action.h +++ b/apps/plugins/text_viewer/tv_action.h @@ -58,11 +58,8 @@ bool tv_init_action(unsigned char **buf, size_t *bufsize); /* * finalize modules - * - * [In] parameter - * this argument does not use */ -void tv_exit(void *parameter); +void tv_exit(void); /* * load the file |