r19295 by jghali - fix signal blocking potentially not correctly restored in util.cpp setCurrentComboItem

[scribus-commit]

Author: jghali
Date: Sat Jun 28 18:58:41 2014
New Revision: 19295

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=19295
Log:
fix signal blocking potentially not correctly restored in util.cpp setCurrentComboItem

Modified:
    branches/Version14x/Scribus/scribus/util.cpp

Modified: branches/Version14x/Scribus/scribus/util.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=19295&path=/branches/Version14x/Scribus/scribus/util.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/util.cpp (original)
+++ branches/Version14x/Scribus/scribus/util.cpp Sat Jun 28 18:58:41 2014
@@ -781,11 +781,11 @@
 
 void setCurrentComboItem(QComboBox *box, QString text)
 {
-	box->blockSignals(true);
+	bool sigBlocked = box->blockSignals(true);
 	int ind = box->findText(text);
 	if (ind > -1)
 		box->setCurrentIndex(ind);
-	box->blockSignals(false);
+	box->blockSignals(sigBlocked);
 }
 
 QString getDashString(int dashtype, double linewidth)