openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Tim Bentley has proposed merging lp:~trb143/openlp/bug-891781 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #891781 in OpenLP: "Exported theme files are containing obsolent images"
  https://bugs.launchpad.net/openlp/+bug/891781

For more details, see:
https://code.launchpad.net/~trb143/openlp/bug-891781/+merge/82735

Amend check to allow deletes to work if theme image is removed
-- 
https://code.launchpad.net/~trb143/openlp/bug-891781/+merge/82735
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/bug-891781 into lp:openlp.

=== modified file 'openlp/core/ui/thememanager.py'
--- openlp/core/ui/thememanager.py	2011-10-01 07:28:45 +0000
+++ openlp/core/ui/thememanager.py	2011-11-18 19:40:00 +0000
@@ -370,7 +370,7 @@
 
     def onExportTheme(self):
         """
-        Save the theme in a zip file
+        Export the theme in a zip file
         """
         item = self.themeListWidget.currentItem()
         if item is None:
@@ -625,7 +625,7 @@
         theme_dir = os.path.join(self.path, name)
         check_directory_exists(theme_dir)
         theme_file = os.path.join(theme_dir, name + u'.xml')
-        if imageTo and self.oldBackgroundImage and \
+        if self.oldBackgroundImage and \
             imageTo != self.oldBackgroundImage:
             delete_file(self.oldBackgroundImage)
         outfile = None