Merge branch 'master' into fast-forward-hotkey

1 files changed, 15 insertions, 1 deletions

diff --git a/src/libui_sdl/DlgAudioSettings.cpp b/src/libui_sdl/DlgAudioSettings.cpp
index 66bdf61..d649321 100644
--- a/src/libui_sdl/DlgAudioSettings.cpp
+++ b/src/libui_sdl/DlgAudioSettings.cpp
@@ -44,8 +44,15 @@ uiEntry* txMicWavPath;
 int oldvolume;
 
 
+void RevertSettings()
+{
+    Config::AudioVolume = oldvolume;
+}
+
+
 int OnCloseWindow(uiWindow* window, void* blarg)
 {
+    RevertSettings();
     opened = false;
     return 1;
 }
@@ -69,7 +76,7 @@ void OnMicWavBrowse(uiButton* btn, void* blarg)
 
 void OnCancel(uiButton* btn, void* blarg)
 {
-    Config::AudioVolume = oldvolume;
+    RevertSettings();
 
     uiControlDestroy(uiControl(win));
     opened = false;
@@ -180,4 +187,11 @@ void Open()
     uiControlShow(uiControl(win));
 }
 
+void Close()
+{
+    if (!opened) return;
+    uiControlDestroy(uiControl(win));
+    opened = false;
+}
+
 }