2 files changed, 79 insertions, 11 deletions

diff --git a/apps/settings.c b/apps/settings.c
index 1e857d24f3..5357a950c4 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -934,6 +934,7 @@ bool set_int(char* string,
 {
     bool done = false;
     int button;
+    int org_value=*variable;
 
 #ifdef HAVE_LCD_BITMAP
     if(global_settings.statusbar)
@@ -978,10 +979,30 @@ bool set_int(char* string,
 
 #ifdef HAVE_RECORDER_KEYPAD
             case BUTTON_LEFT:
+            case BUTTON_PLAY:
+#else
+            case BUTTON_PLAY:
+#endif
+                done = true;
+                if (*variable != org_value) {
+                   lcd_stop_scroll();
+                   lcd_puts(0, 0, str(LANG_MENU_SETTING_OK));
+                   sleep(HZ/2);
+                }
+                break;
+
+#ifdef HAVE_RECORDER_KEYPAD
+            case BUTTON_OFF:
 #else
             case BUTTON_STOP:
             case BUTTON_MENU:
 #endif
+                if (*variable != org_value) {
+                   *variable=org_value;
+                   lcd_stop_scroll();
+                   lcd_puts(0, 0, str(LANG_MENU_SETTING_CANCEL));
+                   sleep(HZ/2);
+                }
                 done = true;
                 break;
 
@@ -1009,6 +1030,7 @@ bool set_option(char* string, int* variable, char* options[],
 {
     bool done = false;
     int button;
+    int org_value=*variable;
 
 #ifdef HAVE_LCD_BITMAP
     if(global_settings.statusbar)
@@ -1016,6 +1038,7 @@ bool set_option(char* string, int* variable, char* options[],
     else
         lcd_setmargins(0, 0);
 #endif
+
     lcd_clear_display();
     lcd_puts_scroll(0, 0, string);
 
@@ -1056,10 +1079,30 @@ bool set_option(char* string, int* variable, char* options[],
 
 #ifdef HAVE_RECORDER_KEYPAD
             case BUTTON_LEFT:
+            case BUTTON_PLAY:
+#else
+            case BUTTON_PLAY:
+#endif
+                done = true;
+                if (*variable != org_value) {
+                   lcd_stop_scroll();
+                   lcd_puts(0, 0, str(LANG_MENU_SETTING_OK));
+                   sleep(HZ/2);
+                }
+                break;
+
+#ifdef HAVE_RECORDER_KEYPAD
+            case BUTTON_OFF:
 #else
             case BUTTON_STOP:
             case BUTTON_MENU:
 #endif
+                if (*variable != org_value) {
+                   *variable=org_value;
+                   lcd_stop_scroll();
+                   lcd_puts(0, 0, str(LANG_MENU_SETTING_CANCEL));
+                   sleep(HZ/2);
+                }
                 done = true;
                 break;
 
diff --git a/apps/sleeptimer.c b/apps/sleeptimer.c
index ba554cc91c..b47d93698a 100644
--- a/apps/sleeptimer.c
+++ b/apps/sleeptimer.c
@@ -29,6 +29,7 @@
 #include "power.h"
 #include "powermgmt.h"
 #include "status.h"
+#include "debug.h"
 
 #include "lang.h"
 
@@ -49,6 +50,8 @@ bool sleeptimer_screen(void)
     char buf[32];
     int oldtime, newtime;
     int amount = 0;
+    int org_timer=get_sleep_timer();
+    bool changed=false;
 
 #ifdef HAVE_LCD_BITMAP
     lcd_setfont(FONT_UI);
@@ -56,19 +59,42 @@ bool sleeptimer_screen(void)
     lcd_setmargins(w, 8);
 #endif
     
+    lcd_clear_display();
+    lcd_puts_scroll(0, 0, str(LANG_SLEEP_TIMER));
+
     while(!done)
     {
-        button = button_get_w_tmo(HZ/20);
+        button = button_get_w_tmo(HZ);
         switch(button)
         {
-#ifdef HAVE_PLAYER_KEYPAD
-        case BUTTON_STOP:
+#ifdef HAVE_RECORDER_KEYPAD
+        case BUTTON_LEFT:
+        case BUTTON_PLAY:
 #else
+        case BUTTON_PLAY:
+#endif
+          done = true;
+          if (changed) {
+            lcd_stop_scroll();
+            lcd_puts(0, 0, str(LANG_MENU_SETTING_OK));
+            sleep(HZ/2);
+          }
+          break;
+
+#ifdef HAVE_RECORDER_KEYPAD
         case BUTTON_OFF:
-        case BUTTON_LEFT:
+#else
+        case BUTTON_STOP:
+        case BUTTON_MENU:
 #endif
-            done = true;
-            break;
+          if (changed) {
+            lcd_stop_scroll();
+            lcd_puts(0, 0, str(LANG_MENU_SETTING_CANCEL));
+            set_sleep_timer(org_timer);
+            sleep(HZ/2);
+          }
+          done = true;
+          break;
 
 #ifdef HAVE_PLAYER_KEYPAD
         case BUTTON_RIGHT:
@@ -76,7 +102,6 @@ bool sleeptimer_screen(void)
         case BUTTON_UP:
 #endif
             oldtime = (get_sleep_timer()+59) / 60;
-            
             if(oldtime < THRESHOLD)
                 amount = SMALL_STEP_SIZE;
             else
@@ -85,7 +110,8 @@ bool sleeptimer_screen(void)
             newtime = oldtime * 60 + amount;
             if(newtime > MAX_TIME)
                 newtime = MAX_TIME;
-            
+
+            changed=true;
             set_sleep_timer(newtime);
             break;
                 
@@ -95,7 +121,6 @@ bool sleeptimer_screen(void)
         case BUTTON_DOWN:
 #endif
             oldtime = (get_sleep_timer()+59) / 60;
-            
             if(oldtime <= THRESHOLD)
                 amount = SMALL_STEP_SIZE;
             else
@@ -105,14 +130,13 @@ bool sleeptimer_screen(void)
             if(newtime < 0)
                 newtime = 0;
             
+            changed=true;
             set_sleep_timer(newtime);
             break;
         }
 
         seconds = get_sleep_timer();
 
-        lcd_clear_display();
-        lcd_puts(0, 0, str(LANG_SLEEP_TIMER));
         if(seconds)
         {
             seconds += 59; /* Round up for a "friendlier" display */
@@ -131,5 +155,6 @@ bool sleeptimer_screen(void)
 
         lcd_update();
     }
+    lcd_stop_scroll();
     return false;
 }