First step in revamping the USB event handling, paving the way for the upcoming SYS_POWER_OFF event

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4951 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 7 insertions, 4 deletions

diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index 5da733c..1141361 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -43,6 +43,7 @@
 #include "screens.h"
 #include "talk.h"
 #include "timefuncs.h"
+#include "misc.h"
 #ifdef HAVE_LCD_BITMAP
 #include "peakmeter.h"
 #endif
@@ -1037,6 +1038,7 @@ static bool reset_settings(void)
 {
     bool done=false;
     int line;
+    int button;
  
     lcd_clear_display();
 
@@ -1052,7 +1054,8 @@ static bool reset_settings(void)
     lcd_update();
      
     while(!done) {
-        switch(button_get(true)) {
+        button = button_get(true);
+        switch(button) {
         case BUTTON_PLAY:
             settings_reset();
             settings_apply();
@@ -1071,9 +1074,9 @@ static bool reset_settings(void)
             done = true;
             break;
 
-        case SYS_USB_CONNECTED:
-            usb_screen();
-            return true;
+        default:
+            if(default_event_handler(button) == SYS_USB_CONNECTED)
+                return true;
         }
     }