3 files changed, 5 insertions(+), 2 deletions(-)

M products/BellHybrid/apps/application-bell-settings/presenter/BedtimeSettingsPresenter.cpp
M products/BellHybrid/apps/application-bell-settings/presenter/alarm_settings/AlarmSettingsPresenter.cpp
M products/BellHybrid/apps/application-bell-settings/windows/alarm_settings/BellSettingsAlarmSettingsWindow.cpp

@@ 22,7 22,6 @@ namespace app::bell_settings
         this->provider->onExit = [this]() { getView()->exit(); };
 
         this->provider->onToneEnter  = playSound;
-        this->provider->onToneExit   = [this](const auto &) { stopSound(); };
         this->provider->onToneChange = playSound;
 
         this->provider->onVolumeEnter  = playSound;


@@ 65,6 64,7 @@ namespace app::bell_settings
     }
     void SettingsPresenter::exitWithoutSave()
     {
+        this->stopSound();
         model->getBedtimeVolume().restoreDefault();
     }
 } // namespace app::bell_settings

@@ 22,7 22,6 @@ namespace app::bell_settings
         this->provider->onExit = [this]() { getView()->exit(); };
 
         this->provider->onToneEnter  = playSound;
-        this->provider->onToneExit   = [this](const auto &) { stopSound(); };
         this->provider->onToneChange = playSound;
 
         this->provider->onVolumeEnter  = playSound;


@@ 67,6 66,7 @@ namespace app::bell_settings
 
     void AlarmSettingsPresenter::exitWithRollback()
     {
+        this->stopSound();
         model->getAlarmVolume().restoreDefault();
         eraseProviderData();
     }

@@ 55,6 55,9 @@ namespace gui
             exit();
             return true;
         }
+        if (inputEvent.isShortRelease(KeyCode::KEY_RF)) {
+            presenter->exitWithRollback();
+        }
 
         return AppWindow::onInput(inputEvent);
     }