From 9dbd54bf8f6396c1121ca13b0dec77f07809862c Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@lavabit.com>
Date: Sun, 10 Apr 2011 20:44:27 +0200
Subject: [PATCH] more fixes

---
 openlp/core/ui/servicemanager.py      |  4 ++--
 openlp/plugins/songs/lib/mediaitem.py | 15 ++++++++-------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index adafe5fd6..5e14ec637 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -691,9 +691,9 @@ class ServiceManager(QtGui.QWidget):
         Called by the SlideController to request a preview item be made live
         and allows the next preview to be updated if relevent.
         """
-        id, row = message.split(u':')
+        uuid, row = message.split(u':')
         for sitem in self.serviceItems:
-            if sitem[u'service_item']._uuid == id:
+            if sitem[u'service_item']._uuid == uuid:
                 item = self.serviceManagerList.topLevelItem(sitem[u'order'] - 1)
                 self.serviceManagerList.setCurrentItem(item)
                 self.makeLive(int(row))
diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py
index f4803d653..e2882ed29 100644
--- a/openlp/plugins/songs/lib/mediaitem.py
+++ b/openlp/plugins/songs/lib/mediaitem.py
@@ -283,19 +283,20 @@ class SongMediaItem(MediaManagerItem):
         self.remoteTriggered = None
         self.remoteSong = -1
 
-    def onRemoteEdit(self, songid):
+    def onRemoteEdit(self, message):
         """
         Called by ServiceManager or SlideController by event passing
         the Song Id in the payload along with an indicator to say which
         type of display is required.
         """
-        log.debug(u'onRemoteEdit %s' % songid)
-        fields = songid.split(u':')
-        valid = self.parent.manager.get_object(Song, fields[1])
+        log.debug(u'onRemoteEdit %s' % message)
+        remote_type, song_id = message.split(u':')
+        song_id = int(song_id)
+        valid = self.parent.manager.get_object(Song, song_id)
         if valid:
-            self.remoteSong = fields[1]
-            self.remoteTriggered = fields[0]
-            self.edit_song_form.loadSong(fields[1], (fields[0] == u'P'))
+            self.remoteSong = song_id
+            self.remoteTriggered = remote_type
+            self.edit_song_form.loadSong(song_id, (remote_type == u'P'))
             self.edit_song_form.exec_()
 
     def onEditClick(self):