r18688 by fschmid - Fixed Bug #11928: Scribus colour palette cannot be imported anymore

[scribus-commit]

Author: fschmid
Date: Tue Jan  7 12:00:49 2014
New Revision: 18688

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18688
Log:
Fixed Bug #11928: Scribus colour palette cannot be imported anymore

Modified:
    trunk/Scribus/scribus/util_color.cpp

Modified: trunk/Scribus/scribus/util_color.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18688&path=/trunk/Scribus/scribus/util_color.cpp
==============================================================================
--- trunk/Scribus/scribus/util_color.cpp (original)
+++ trunk/Scribus/scribus/util_color.cpp Tue Jan  7 12:00:49 2014
@@ -731,10 +731,11 @@
 						{
 							EditColors.tryAddColor(it.key(), it.value());
 						}
+						return (EditColors.count() != oldCount);
 					}
 				}
 			}
-			else if (ext == "acb")			// Adobe color book format
+			if (ext == "acb")			// Adobe color book format
 			{
 				QFile fiC(fileName);
 				if (fiC.open(QIODevice::ReadOnly))