r20900 by jghali -

[scribus-commit]

Author: jghali
Date: Fri Feb  5 19:41:35 2016
New Revision: 20900

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=20900
Log:
#13710: Duplicating a color, no difference in edit color dialog between OK and cancel

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

Modified: trunk/Scribus/scribus/ui/paintmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=20900&path=/trunk/Scribus/scribus/ui/paintmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/ui/paintmanager.cpp	(original)
+++ trunk/Scribus/scribus/ui/paintmanager.cpp	Fri Feb  5 19:41:35 2016
@@ -661,6 +661,11 @@
 				itemSelected(dataTree->currentItem());
 				modified = true;
 			}
+			else
+			{
+				dialogGradients.remove(gradN);
+				origNames.remove(gradN);
+			}
 			delete dia;
 		}
 		else if (it->parent() == colorItems)
@@ -691,6 +696,8 @@
 				itemSelected(dataTree->currentItem());
 				modified = true;
 			}
+			else
+				m_colorList.remove(nam);
 			delete dia;
 		}
 	}