From 3f3078c33aa9721a1d82a93d185bdb0d00b857d1 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Tue, 12 Jan 2016 22:29:20 +0100 Subject: [PATCH] Fix traceback when expanding and collapsing songs. Fixes: https://launchpad.net/bugs/1532169 --- openlp/core/ui/servicemanager.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 0a81686b8..e4a1b143a 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -1131,7 +1131,9 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtWidgets.QWidget, Ui_ServiceMa :param item: The service item to be checked """ pos = item.data(0, QtCore.Qt.UserRole) - self.service_items[pos - 1]['expanded'] = False + # Only set root items as collapsed, and since we only have 2 levels we find them by checking for children + if item.childCount(): + self.service_items[pos - 1]['expanded'] = False def on_expand_all(self, field=None): """ @@ -1149,7 +1151,9 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtWidgets.QWidget, Ui_ServiceMa :param item: The service item to be checked """ pos = item.data(0, QtCore.Qt.UserRole) - self.service_items[pos - 1]['expanded'] = True + # Only set root items as expanded, and since we only have 2 levels we find them by checking for children + if item.childCount(): + self.service_items[pos - 1]['expanded'] = True def on_service_top(self, field=None): """