1 files changed, 8 insertions, 4 deletions

diff --git a/apps/plugins/euroconverter.c b/apps/plugins/euroconverter.c
index 24cebe69d1..f85ee798c4 100644
--- a/apps/plugins/euroconverter.c
+++ b/apps/plugins/euroconverter.c
@@ -45,7 +45,7 @@ To do:
 - The Irish currency needs 6 digits after the . to have sufficient precision on big number
 */
 
-
+PLUGIN_HEADER
 
 /* Name and path of the config file*/
 static const char cfg_filename[] =  "euroconverter.cfg";
@@ -387,8 +387,10 @@ static int euro_menu(void)
 
 
 /* Call when the program end */
-static void euro_exit(void)
+static void euro_exit(void *parameter)
 {
+    (void)parameter;
+    
     //Restore the old pattern (i don't find another way to do this. An idea?)
     rb->lcd_unlock_pattern(heuro);
     rb->lcd_unlock_pattern(hhome);
@@ -409,7 +411,6 @@ enum plugin_status plugin_start(const void* parameter)
     /* if you don't use the parameter, you can do like
        this to avoid the compiler warning about it */
     (void)parameter;
-    atexit(euro_exit);
 
     /*Get the pattern handle*/
     heuro=rb->lcd_get_locked_pattern();
@@ -586,7 +587,9 @@ enum plugin_status plugin_start(const void* parameter)
                 break;
 
             default:
-                exit_on_usb(button);
+                if (rb->default_event_handler_ex(button, euro_exit, NULL)
+                     == SYS_USB_CONNECTED)
+                    return PLUGIN_USB_CONNECTED;
                 break;
         }
         /*Display*/
@@ -596,6 +599,7 @@ enum plugin_status plugin_start(const void* parameter)
             e=mydiv(h,currency[country]);
         display(e,h,pos);
     }
+    euro_exit(NULL);
     return PLUGIN_OK;
 }