[pitivi] preset: Restrict removePreset to only work on the current preset

[Thibault Saunier <tsaunier src gnome org>]

commit 8d975e38196d6efce763a5872b22d2342c91c6c3
Author: Alexandru Băluț <alexandru balut gmail com>
Date:   Sun Oct 11 02:01:37 2015 +0200

    preset: Restrict removePreset to only work on the current preset
    
    This is how it's used.
    
    Differential Revision: https://phabricator.freedesktop.org/D372
    Reviewed-by: Thibault Saunier <tsaunier gnome org>

 pitivi/preset.py     |   10 ++++------
 pitivi/project.py    |    2 +-
 pitivi/render.py     |    5 +----
 tests/test_preset.py |    3 ++-
 4 files changed, 8 insertions(+), 12 deletions(-)
---
diff --git a/pitivi/preset.py b/pitivi/preset.py
index 4126964..51a8ec1 100644
--- a/pitivi/preset.py
+++ b/pitivi/preset.py
@@ -200,7 +200,7 @@ class PresetManager(Loggable):
         if "filepath" in self.presets[old_name]:
             # If the previous preset had already been saved,
             # delete the file and pop it from the list
-            self.removePreset(old_name)
+            self.removeCurrentPreset()
         else:
             # We're renaming an unsaved preset, so just pop it from the list
             self.presets.pop(old_name)
@@ -279,9 +279,8 @@ class PresetManager(Loggable):
         return any((values[field] != getter()
                     for field, (setter, getter) in self.widget_map.items()))
 
-    def removePreset(self, name=None):
-        if name is None:
-            name = self.cur_preset
+    def removeCurrentPreset(self):
+        name = self.cur_preset
         preset = self.presets[name]
         filepath = preset.get("filepath")
         if filepath:
@@ -289,8 +288,7 @@ class PresetManager(Loggable):
                 self._markRemoved(name)
             else:
                 os.remove(filepath)
-        if self.cur_preset == name:
-            self.cur_preset = None
+        self.cur_preset = None
         self._forgetPreset(name)
 
     def _forgetPreset(self, name):
diff --git a/pitivi/project.py b/pitivi/project.py
index 88d30cb..8239338 100644
--- a/pitivi/project.py
+++ b/pitivi/project.py
@@ -1719,7 +1719,7 @@ class ProjectSettingsDialog():
         self._updateVideoPresetMenu()
 
     def _removePresetCb(self, unused_action, unused_param, button, combo, mgr):
-        mgr.removePreset()
+        mgr.removeCurrentPreset()
         self._updatePresetActions(button, combo, mgr)
 
     def _savePresetCb(self, unused_action, unused_param, mgr, button, combo):
diff --git a/pitivi/render.py b/pitivi/render.py
index e09b45d..79474e3 100644
--- a/pitivi/render.py
+++ b/pitivi/render.py
@@ -609,10 +609,7 @@ class RenderDialog(Loggable):
         self.remove_render_preset_button.set_sensitive(can_remove)
 
     def _removeRenderPresetButtonClickedCb(self, unused_button):
-        selection = self.render_preset_treeview.get_selection()
-        model, iter_ = selection.get_selected()
-        if iter_:
-            self.render_presets.removePreset(model[iter_][0])
+        self.render_presets.removeCurrentPreset()
 
     def _presetChangedCb(self, selection, mgr, update_preset_buttons_func):
         """Handle the selection of a preset."""
diff --git a/tests/test_preset.py b/tests/test_preset.py
index 2b5d359..843f488 100644
--- a/tests/test_preset.py
+++ b/tests/test_preset.py
@@ -183,7 +183,8 @@ class TestAudioPresetsIO(TestCase):
         self.manager.loadAll()
         system_presets = list(self.manager.presets.keys())
         for preset_name in system_presets:
-            self.manager.removePreset(preset_name)
+            self.manager.restorePreset(preset_name)
+            self.manager.removeCurrentPreset()
 
         # Check that the files have not been deleted or changed.
         other_manager = AudioPresetManager()