From 7addb42c5834caf842b0439ba518bd49c6b2321e Mon Sep 17 00:00:00 2001
From: Etoh <boldly@gmail.com>
Date: Thu, 13 Jun 2013 11:12:00 +0200
Subject: [PATCH] Made MediaBrowse directory persistence code more
 self-contained

---
 syncplay/ui/GuiConfiguration.py | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/syncplay/ui/GuiConfiguration.py b/syncplay/ui/GuiConfiguration.py
index 43951d9..1bad9d1 100644
--- a/syncplay/ui/GuiConfiguration.py
+++ b/syncplay/ui/GuiConfiguration.py
@@ -32,7 +32,6 @@ class ConfigDialog(QtGui.QDialog):
     
     pressedclosebutton = False
     malToggling = False
-    mediadirectory = ""
     
     def malToggled(self):
         if self.malToggling == False:
@@ -115,7 +114,20 @@ class ConfigDialog(QtGui.QDialog):
         if fileName:
             self.executablepathCombobox.setEditText(fileName)
             
+    def loadMediaBrowseSettings(self):
+        settings = QSettings("Syncplay", "MediaBrowseDialog")
+        settings.beginGroup("MediaBrowseDialog")
+        self.mediadirectory = settings.value("mediadir", "")
+        settings.endGroup()
+                        
+    def saveMediaBrowseSettings(self):
+        settings = QSettings("Syncplay", "MediaBrowseDialog")
+        settings.beginGroup("MediaBrowseDialog")
+        settings.setValue("mediadir", self.mediadirectory)
+        settings.endGroup()
+        
     def browseMediapath(self):
+        self.loadMediaBrowseSettings()
         options = QtGui.QFileDialog.Options()
         if (os.path.isdir(self.mediadirectory)):
             defaultdirectory = self.mediadirectory
@@ -131,6 +143,7 @@ class ConfigDialog(QtGui.QDialog):
         if fileName:
             self.mediapathTextbox.setText(fileName)
             self.mediadirectory = os.path.dirname(fileName)
+            self.saveMediaBrowseSettings()
         
     def _saveDataAndLeave(self):
         self.config['host'] = self.hostTextbox.text()
@@ -161,7 +174,6 @@ class ConfigDialog(QtGui.QDialog):
         return
     
     def closeEvent(self, event):
-        self.saveSettings()
         if self.pressedclosebutton == False:
             sys.exit()
             raise GuiConfiguration.WindowClosed
@@ -185,18 +197,6 @@ class ConfigDialog(QtGui.QDialog):
                 self.executablepathCombobox.setEditText(dropfilepath)
             else:
                 self.mediapathTextbox.setText(dropfilepath)
-                
-    def saveSettings(self):
-        settings = QSettings("Syncplay", "ConfigWindow")
-        settings.beginGroup("ConfigWindow")
-        settings.setValue("mediadir", self.mediadirectory)
-        settings.endGroup()
-    
-    def loadSettings(self):
-        settings = QSettings("Syncplay", "ConfigWindow")
-        settings.beginGroup("ConfigWindow")
-        self.mediadirectory = settings.value("mediadir", "")
-        settings.endGroup()
 
     def __init__(self, config, playerpaths, error):
         
@@ -331,5 +331,4 @@ class ConfigDialog(QtGui.QDialog):
         self.setLayout(self.mainLayout)
         self.runButton.setFocus()        
         self.setFixedSize(self.sizeHint())
-        self.loadSettings()
         self.setAcceptDrops(True)