From: Laurent Aimar <fenrir@videolan.org>
Date: Wed, 28 Jul 2010 21:21:12 +0000 (+0200)
Subject: Revert "Qt: Fix save volume on exit Fixes #2968"
X-Git-Tag: 1.2.0-pre1~5630
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=4907ca616f0af20aedfccf62d6ce399e508f5b3e;p=vlc

Revert "Qt: Fix save volume on exit Fixes #2968"

This reverts commit 989ec97aa4b0034e6a4599df11ba5301e5b42af2.

 Sadly, config_SaveConfigFile cannot be used that way as it will save randomly
modified settings as well (at least as long as config_Put* is in use in
the core/modules).
---

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 6528f9f787..d689c4afac 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -507,15 +507,6 @@ static void *Thread( void *obj )
     /* Save the path */
     getSettings()->setValue( "filedialog-path", p_intf->p_sys->filepath );
 
-    /* Save volume on exit */
-    audio_volume_t i_volume;
-    if ( var_InheritBool( p_intf, "qt-autosave-volume" ) )
-        aout_VolumeGet( p_intf, &i_volume );
-    else
-        i_volume = config_GetInt( p_intf, "qt-startvolume" );
-    config_PutInt( p_intf, "volume", i_volume );
-    config_SaveConfigFile( p_intf, NULL );
-
     /* Delete the configuration. Application has to be deleted after that. */
     delete p_intf->p_sys->mainSettings;