← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~erik-lundin/openlp/bug-1296574 into lp:openlp

 

Erik Lundin has proposed merging lp:~erik-lundin/openlp/bug-1296574 into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1296574 in OpenLP: "Missing arguments in some event handler functions"
  https://bugs.launchpad.net/openlp/+bug/1296574

For more details, see:
https://code.launchpad.net/~erik-lundin/openlp/bug-1296574/+merge/236035

Fix for another occurance of bug #1296574.
-- 
https://code.launchpad.net/~erik-lundin/openlp/bug-1296574/+merge/236035
Your team OpenLP Core is requested to review the proposed merge of lp:~erik-lundin/openlp/bug-1296574 into lp:openlp.
=== modified file 'openlp/core/ui/slidecontroller.py'
--- openlp/core/ui/slidecontroller.py	2014-07-12 23:47:53 +0000
+++ openlp/core/ui/slidecontroller.py	2014-09-25 21:04:50 +0000
@@ -1242,7 +1242,7 @@
         if event.timerId() == self.timer_id:
             self.on_slide_selected_next(self.play_slides_loop.isChecked())
 
-    def on_edit_song(self):
+    def on_edit_song(self, checked=None):
         """
         From the preview display requires the service Item to be editied
         """
@@ -1251,7 +1251,7 @@
         if new_item:
             self.add_service_item(new_item)
 
-    def on_preview_add_to_service(self):
+    def on_preview_add_to_service(self, checked=None):
         """
         From the preview display request the Item to be added to service
         """


Follow ups