diff options
Diffstat (limited to 'apps/plugins/clock')
| -rw-r--r-- | apps/plugins/clock/clock.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/apps/plugins/clock/clock.c b/apps/plugins/clock/clock.c index f06f3e1..8a1a55e 100644 --- a/apps/plugins/clock/clock.c +++ b/apps/plugins/clock/clock.c @@ -22,6 +22,7 @@ #include "plugin.h" #include "time.h" #include "lib/pluginlib_actions.h" +#include "lib/pluginlib_exit.h" #include "lib/xlcd.h" #include "clock.h" @@ -30,7 +31,7 @@ #include "clock_menu.h" #include "clock_settings.h" -PLUGIN_HEADER + /* Keymaps */ const struct button_mapping* plugin_contexts[]={ @@ -56,9 +57,8 @@ const struct button_mapping* plugin_contexts[]={ /************************** * Cleanup on plugin return *************************/ -void cleanup(void *parameter) +void cleanup(void) { - (void)parameter; clock_draw_restore_colors(); if(clock_settings.general.save_settings == 1) save_settings(); @@ -115,6 +115,7 @@ enum plugin_status plugin_start(const void* parameter){ struct counter counter; bool exit_clock = false; (void)parameter; + atexit(cleanup); #if LCD_DEPTH > 1 rb->lcd_set_backdrop(NULL); @@ -174,9 +175,7 @@ enum plugin_status plugin_start(const void* parameter){ exit_clock=main_menu(); break; default: - if(rb->default_event_handler_ex(button, cleanup, NULL) - == SYS_USB_CONNECTED) - return PLUGIN_USB_CONNECTED; + exit_on_usb(button); if(time.second != last_second){ last_second=time.second; redraw=true; @@ -193,6 +192,5 @@ enum plugin_status plugin_start(const void* parameter){ } } - cleanup(NULL); return PLUGIN_OK; } |