From 2095a6d0d0957bd2148a60aefa662c542c3ff9b5 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sun, 17 Jun 2012 18:25:56 +0200
Subject: [PATCH] fixed wrong image being kept in cache when aborting the
 themeform

---
 openlp/core/lib/renderer.py    | 1 +
 openlp/core/ui/themeform.py    | 1 +
 openlp/core/ui/thememanager.py | 4 ++++
 3 files changed, 6 insertions(+)

diff --git a/openlp/core/lib/renderer.py b/openlp/core/lib/renderer.py
index e35c78559..a7f830944 100644
--- a/openlp/core/lib/renderer.py
+++ b/openlp/core/lib/renderer.py
@@ -134,6 +134,7 @@ class Renderer(object):
         else:
             theme_data, main_rect, footer_rect = \
                 self._theme_dimensions[theme_name]
+        self.image_manager.deleteImage(theme_data.theme_name)
         # if No file do not update cache
         if theme_data.background_filename:
             self.image_manager.addImage(theme_data.theme_name,
diff --git a/openlp/core/ui/themeform.py b/openlp/core/ui/themeform.py
index 60e073b13..5d3526adb 100644
--- a/openlp/core/ui/themeform.py
+++ b/openlp/core/ui/themeform.py
@@ -54,6 +54,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
             The QWidget-derived parent of the wizard.
         """
         QtGui.QWizard.__init__(self, parent)
+        #FIXME: remove self.thememanager and use self.parent() instead.
         self.thememanager = parent
         self.setupUi(self)
         self.registerFields()
diff --git a/openlp/core/ui/thememanager.py b/openlp/core/ui/thememanager.py
index 7ca56ce08..72c354dff 100644
--- a/openlp/core/ui/thememanager.py
+++ b/openlp/core/ui/thememanager.py
@@ -138,13 +138,17 @@ class ThemeManager(QtGui.QWidget):
         QtCore.QObject.connect(Receiver.get_receiver(),
             QtCore.SIGNAL(u'config_updated'), self.configUpdated)
         # Variables
+        #FIXME: convert to camelCase.
         self.theme_list = []
         self.path = AppLocation.get_section_data_path(self.settingsSection)
         check_directory_exists(self.path)
+        #FIXME: convert to camelCase.
         self.thumb_path = os.path.join(self.path, u'thumbnails')
         check_directory_exists(self.thumb_path)
         self.themeForm.path = self.path
+        #FIXME: convert to camelCase.
         self.old_background_image = None
+        #FIXME: convert to camelCase.
         self.bad_v1_name_chars = re.compile(r'[%+\[\]]')
         # Last little bits of setting up
         self.configUpdated()