openlp-core team mailing list archive

[Jonathan Corwin <j@xxxxxxxxxxxx>]

Jonathan Corwin has proposed merging lp:~j-corwin/openlp/present into lp:openlp.

    Requested reviews:
    OpenLP Core (openlp-core)


Fix a couple of Impress load/reload bugs
-- 
https://code.launchpad.net/~j-corwin/openlp/present/+merge/13679
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/plugins/presentations/lib/messagelistener.py'
--- openlp/plugins/presentations/lib/messagelistener.py	2009-10-17 18:56:31 +0000
+++ openlp/plugins/presentations/lib/messagelistener.py	2009-10-20 22:45:20 +0000
@@ -74,8 +74,7 @@
             return
         if not self.controller.is_loaded():
             self.controller.load_presentation(self.controller.filepath)
-        else:
-            self.controller.start_presentation()
+        self.controller.start_presentation()
         if self.controller.slidenumber > 1:
             self.controller.goto_slide(self.controller.slidenumber)
         

=== modified file 'openlp/plugins/presentations/lib/presentationcontroller.py'
--- openlp/plugins/presentations/lib/presentationcontroller.py	2009-10-11 21:31:27 +0000
+++ openlp/plugins/presentations/lib/presentationcontroller.py	2009-10-20 22:45:20 +0000
@@ -198,6 +198,8 @@
         recent than the powerpoint
         """
         lastimage = self.get_slide_preview_file(self.get_slide_count())
+        if lastimage is None:
+            return False
         if not os.path.isfile(lastimage):
             return False
         imgdate = os.stat(lastimage).st_mtime