openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol/openlp/bug-1046508 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~googol/openlp/bug-1046508/+merge/125304

- do not reload theme list twice when renaming a theme
- fixed not reloading list after adding a new theme [regression]

-- 
https://code.launchpad.net/~googol/openlp/bug-1046508/+merge/125304
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/bug-1046508 into lp:openlp.

=== modified file 'openlp/core/ui/thememanager.py'
--- openlp/core/ui/thememanager.py	2012-09-06 13:49:47 +0000
+++ openlp/core/ui/thememanager.py	2012-09-19 18:49:20 +0000
@@ -257,6 +257,7 @@
         theme.set_default_header_footer()
         self.themeForm.theme = theme
         self.themeForm.exec_()
+        self.loadThemes()
 
     def onRenameTheme(self):
         """
@@ -283,7 +284,6 @@
                             plugin.renameTheme(old_theme_name, new_theme_name)
                     self.mainwindow.renderer.update_theme(
                         new_theme_name, old_theme_name)
-                    self.loadThemes()
 
     def onCopyTheme(self):
         """