From cecd2298a74ec36613eb7d719ea92d10f5f5dfd8 Mon Sep 17 00:00:00 2001 From: Philip Ridout Date: Sun, 8 Oct 2017 21:36:11 +0100 Subject: [PATCH] fixes #1660486 - Dragging item in service manager without changes triggeres 'unsaved' --- openlp/core/common/settings.py | 4 ++-- openlp/core/ui/servicemanager.py | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/openlp/core/common/settings.py b/openlp/core/common/settings.py index 48d8710a0..6f681b7d5 100644 --- a/openlp/core/common/settings.py +++ b/openlp/core/common/settings.py @@ -271,8 +271,8 @@ class Settings(QtCore.QSettings): ] __setting_upgrade_3__ = [ - ('songuasge/db password', 'songusage/db password', []) - ('songuasge/db hostname', 'songusage/db hostname', []) + ('songuasge/db password', 'songusage/db password', []), + ('songuasge/db hostname', 'songusage/db hostname', []), ('songuasge/db database', 'songusage/db database', []) ] diff --git a/openlp/core/ui/servicemanager.py b/openlp/core/ui/servicemanager.py index 42c8dea6d..42a45cafd 100644 --- a/openlp/core/ui/servicemanager.py +++ b/openlp/core/ui/servicemanager.py @@ -1663,14 +1663,15 @@ class ServiceManager(OpenLPMixin, RegistryMixin, QtWidgets.QWidget, Ui_ServiceMa if start_pos == -1: return if item is None: - end_pos = len(self.service_items) + end_pos = len(self.service_items) - 1 else: end_pos = get_parent_item_data(item) - 1 service_item = self.service_items[start_pos] - self.service_items.remove(service_item) - self.service_items.insert(end_pos, service_item) - self.repaint_service_list(end_pos, child) - self.set_modified() + if start_pos != end_pos: + self.service_items.remove(service_item) + self.service_items.insert(end_pos, service_item) + self.repaint_service_list(end_pos, child) + self.set_modified() else: # we are not over anything so drop replace = False