r22241 by jghali -

[scribus-commit]

Author: jghali
Date: Fri Dec  8 23:05:36 2017
New Revision: 22241

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22241
Log:
#15065: 'Color and Fills' menu - gui isn't working properly when marking a non CMYK color as 'Spot Color'

Modified:
    trunk/Scribus/scribus/ui/cmykfw.cpp

Modified: trunk/Scribus/scribus/ui/cmykfw.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22241&path=/trunk/Scribus/scribus/ui/cmykfw.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/cmykfw.cpp	(original)
+++ trunk/Scribus/scribus/ui/cmykfw.cpp	Fri Dec  8 23:05:36 2017
@@ -561,14 +561,18 @@
 
 void CMYKChoose::setSpot()
 {
-	disconnect(ComboBox1, SIGNAL(activated(const QString&)), this, SLOT(selModel(const QString&)));
+	QSignalBlocker comboBox1Blocker(ComboBox1);
 	if (Separations->isChecked())
 	{
-		ComboBox1->setCurrentIndex( 0 );
 //		Commented out to allow RGB Spot-Colors
+//		ComboBox1->setCurrentIndex( 0 );
 //		selModel( tr("CMYK"));
-	}
-	connect(ComboBox1, SIGNAL(activated(const QString&)), this, SLOT(selModel(const QString&)));
+		if (ComboBox1->currentIndex() == 2) // Web Safe RGB
+		{
+			ComboBox1->setCurrentIndex(1);
+			selModel( tr("RGB"));
+		}
+	}
 }
 
 void CMYKChoose::selModel(const QString& mod)