From 73a86a8bf742ca01be538074fef60f6eec6fef78 Mon Sep 17 00:00:00 2001
From: Richard Maudsley <richard.maudsley@isode.com>
Date: Fri, 17 Jan 2014 14:05:58 +0000
Subject: Fixed saving current dialog state without changing list item first.

Change-Id: I4b4ad06ca8e25b61765827d09b7e263028aac39e

diff --git a/Swift/QtUI/QtHighlightEditor.cpp b/Swift/QtUI/QtHighlightEditor.cpp
index 87e16d3..bd52e2d 100644
--- a/Swift/QtUI/QtHighlightEditor.cpp
+++ b/Swift/QtUI/QtHighlightEditor.cpp
@@ -252,6 +252,7 @@ void QtHighlightEditor::onCurrentRowChanged(int currentRow)
 
 void QtHighlightEditor::onApplyButtonClick()
 {
+	selectRow(getSelectedRow()); /* force save */
 	highlightManager_->storeSettings();
 }
 
@@ -262,7 +263,7 @@ void QtHighlightEditor::onCancelButtonClick()
 
 void QtHighlightEditor::onOkButtonClick()
 {
-	highlightManager_->storeSettings();
+	onApplyButtonClick();
 	close();
 }
 
@@ -272,11 +273,12 @@ void QtHighlightEditor::selectRow(int row)
 		if (i == row) {
 			ui_.listWidget->item(i)->setSelected(true);
 			onCurrentRowChanged(i);
+		} else {
+			ui_.listWidget->item(i)->setSelected(false);
 		}
 	}
 }
 
-/** Return index of selected row or -1 if none is selected */
 int QtHighlightEditor::getSelectedRow() const
 {
 	for (int i = 0; i < ui_.listWidget->count(); ++i) {
-- 
cgit v0.10.2-6-g49f6