Fixed up a few things, including updating theme when reactivating the current song.

openlp/core/ui/slidecontroller.py

@@ -582,7 +582,7 @@ class SlideController(QtGui.QWidget):
         """
         Replacement item following a remote edit
         """
-        if item.__eq__(self.serviceItem):
+        if item == self.serviceItem:
             self._processItem(item, self.previewListWidget.currentRow())
 
     def addServiceManagerItem(self, item, slideno):
@@ -592,15 +592,17 @@ class SlideController(QtGui.QWidget):
         Called by ServiceManager
         """
         log.debug(u'addServiceManagerItem live = %s' % self.isLive)
-        # If no valid slide number is specified we take the first one.
+        # If no valid slide number is specified we take the first one, but we
+        # remember the initial value to see if we should reload the song or not
+        slidenum = slideno
         if slideno == -1:
-            slideno = 0
+            slidenum = 0
-        # If service item is the same as the current on only change slide
+        # If service item is the same as the current one, only change slide
-        if item.__eq__(self.serviceItem):
+        if slideno >= 0 and item == self.serviceItem:
-            self.__checkUpdateSelectedSlide(slideno)
+            self.__checkUpdateSelectedSlide(slidenum)
             self.slideSelected()
-            return
+        else:
-        self._processItem(item, slideno)
+            self._processItem(item, slidenum)
 
     def _processItem(self, serviceItem, slideno):
         """

openlp/plugins/songs/lib/mediaitem.py

@@ -354,7 +354,7 @@ class SongMediaItem(MediaManagerItem):
         if valid:
             self.remoteSong = song_id
             self.remoteTriggered = remote_type
-            self.edit_song_form.loadSong(song_id, (remote_type == u'P'))
+            self.edit_song_form.loadSong(song_id, remote_type == u'P')
             self.edit_song_form.exec_()
             self.auto_select_id = -1
             self.onSongListLoad()