From 7e57fa2f954df0783b6bfed5042978be75be69b6 Mon Sep 17 00:00:00 2001
From: Andreas Preikschat <googol@hush.com>
Date: Thu, 20 Jan 2011 17:43:29 +0100
Subject: [PATCH] Don't select the child item if not selected

---
 openlp/core/ui/servicemanager.py  | 8 ++++----
 openlp/core/ui/slidecontroller.py | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py
index f9adca9d7..3bdda5516 100644
--- a/openlp/core/ui/servicemanager.py
+++ b/openlp/core/ui/servicemanager.py
@@ -844,13 +844,13 @@ class ServiceManager(QtGui.QWidget):
                 treewidgetitem1.setText(0, text[:40])
                 treewidgetitem1.setData(0, QtCore.Qt.UserRole,
                     QtCore.QVariant(count))
-                if serviceItem == itemcount and serviceItemCount == count:
+                if serviceItem == itemcount:
                     # Preserve expanding status as setCurrentItem sets it to
                     # True.
                     temp = item[u'expanded']
-                    if item[u'expanded']:
+                    if item[u'expanded'] and serviceItemCount == count:
                         self.serviceManagerList.setCurrentItem(treewidgetitem1)
-                    else:
+                    elif serviceItemCount == -1:
                         self.serviceManagerList.setCurrentItem(treewidgetitem)
                     item[u'expanded'] = temp
             treewidgetitem.setExpanded(item[u'expanded'])
@@ -1060,7 +1060,7 @@ class ServiceManager(QtGui.QWidget):
         """
         items = self.serviceManagerList.selectedItems()
         pos = 0
-        count = 0
+        count = -1
         for item in items:
             parentitem = item.parent()
             if parentitem is None:
diff --git a/openlp/core/ui/slidecontroller.py b/openlp/core/ui/slidecontroller.py
index 28b419616..3e3438100 100644
--- a/openlp/core/ui/slidecontroller.py
+++ b/openlp/core/ui/slidecontroller.py
@@ -525,6 +525,9 @@ 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 slideno == -1:
+            slideno = 0
         # If service item is the same as the current on only change slide
         if item.__eq__(self.serviceItem):
             if slideno + 1 < self.PreviewListWidget.rowCount():