← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~googol/openlp/renderer-empty-theme into lp:openlp

 

Andreas Preikschat has proposed merging lp:~googol/openlp/renderer-empty-theme into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~googol/openlp/renderer-empty-theme/+merge/173326

Hello,

Sometimes an empty theme name is passed (e. g. no service theme selected). Do not add those to our internal memory. (Btw, this does not fix any bug!)
-- 
https://code.launchpad.net/~googol/openlp/renderer-empty-theme/+merge/173326
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/renderer-empty-theme into lp:openlp.
=== modified file 'openlp/core/lib/renderer.py'
--- openlp/core/lib/renderer.py	2013-04-24 19:05:34 +0000
+++ openlp/core/lib/renderer.py	2013-07-06 19:25:29 +0000
@@ -107,7 +107,7 @@
             del self._theme_dimensions[old_theme_name]
         if theme_name in self._theme_dimensions:
             del self._theme_dimensions[theme_name]
-        if not only_delete:
+        if not only_delete and theme_name:
             self._set_theme(theme_name)
 
     def _set_theme(self, theme_name):


Follow ups