From 4c1fe14fd2f018292eb15e2eff05c96fb94a86e6 Mon Sep 17 00:00:00 2001 From: Jonathan Corwin Date: Sat, 13 Oct 2012 19:32:32 +0100 Subject: [PATCH] Raoul's kicks --- openlp/plugins/presentations/lib/impresscontroller.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/openlp/plugins/presentations/lib/impresscontroller.py b/openlp/plugins/presentations/lib/impresscontroller.py index b1c0bcc82..3d78f7bdb 100644 --- a/openlp/plugins/presentations/lib/impresscontroller.py +++ b/openlp/plugins/presentations/lib/impresscontroller.py @@ -153,9 +153,7 @@ class ImpressController(PresentationController): desktop = None try: desktop = self.manager.createInstance(u'com.sun.star.frame.Desktop') - except AttributeError: - log.warn(u'Failure to find desktop - Impress may have closed') - except pywintypes.com_error: + except (AttributeError, pywintypes.com_error): log.warn(u'Failure to find desktop - Impress may have closed') return desktop if desktop else None @@ -363,9 +361,7 @@ class ImpressDocument(PresentationDocument): log.debug(u'is active OpenOffice') if not self.is_loaded(): return False - if not self.control: - return False - return self.control.isRunning() + return self.control.isRunning() if self.control else False def unblank_screen(self): """