openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

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

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1183078 in OpenLP: "Media file list disappears on restart"
  https://bugs.launchpad.net/openlp/+bug/1183078

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

Hello,

- fixed bug 1183078 (Media file list disappears on restart)

I was about the write a test for it, but did not get along with it. I was trying to create a (generic) plugin, but I need to add a method to the instance (before actually constructing the object).
-- 
https://code.launchpad.net/~googol/openlp/bug-1183078/+merge/175870
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/bug-1183078 into lp:openlp.

=== modified file 'openlp/core/lib/plugin.py'
--- openlp/core/lib/plugin.py	2013-06-24 16:54:23 +0000
+++ openlp/core/lib/plugin.py	2013-07-19 15:45:40 +0000
@@ -308,12 +308,12 @@
         Perform tasks on application startup
         """
         # FIXME: Remove after 2.2 release.
-        # This is needed to load the list of images/media/presentation from the config saved
-        # before the settings rewrite.
+        # This is needed to load the list of media/presentation from the config saved before the settings rewrite.
         if self.media_item_class is not None and self.name != u'images':
             loaded_list = Settings().get_files_from_config(self)
             # Now save the list to the config using our Settings class.
-            Settings().setValue(u'%s/%s files' % (self.settings_section, self.name), loaded_list)
+            if loaded_list:
+                Settings().setValue(u'%s/%s files' % (self.settings_section, self.name), loaded_list)
 
     def uses_theme(self, theme):
         """