← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~googol-hush/openlp/tweaks into lp:openlp

 

Andreas Preikschat has proposed merging lp:~googol-hush/openlp/tweaks into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~googol-hush/openlp/tweaks/+merge/60970

Hello,

Fixed forgotten variable

Traceback (most recent call last):
  File "/home/andreas/Projekte/openlp/trunk/openlp/core/lib/mediamanageritem.py", line 345, in onFileClick
    self.loadList(newFiles)
  File "/home/andreas/Projekte/openlp/trunk/openlp/plugins/presentations/lib/mediaitem.py", line 185, in loadList
    doc.load_presentation()
  File "/home/andreas/Projekte/openlp/trunk/openlp/plugins/presentations/lib/impresscontroller.py", line 255, in load_presentation
    self.controller.plugin.renderer.screens.current_display + 1
AttributeError: 'ScreenList' object has no attribute 'current_display'


-- 
https://code.launchpad.net/~googol-hush/openlp/tweaks/+merge/60970
Your team OpenLP Core is requested to review the proposed merge of lp:~googol-hush/openlp/tweaks into lp:openlp.
=== modified file 'openlp/plugins/presentations/lib/impresscontroller.py'
--- openlp/plugins/presentations/lib/impresscontroller.py	2011-04-30 07:31:03 +0000
+++ openlp/plugins/presentations/lib/impresscontroller.py	2011-05-13 21:02:25 +0000
@@ -252,7 +252,7 @@
             window.setVisible(False)
         self.presentation = self.document.getPresentation()
         self.presentation.Display = \
-            self.controller.plugin.renderer.screens.current_display + 1
+            self.controller.plugin.renderer.screens.current[u'number'] + 1
         self.control = None
         self.create_thumbnails()
         return True


Follow ups