From 2ab844abf8302a489abe86a25a99b54f49ffd91e Mon Sep 17 00:00:00 2001
From: Etienne Tourigny <etourigny.dev@gmail.com>
Date: Fri, 31 Aug 2012 08:54:56 -0300
Subject: [PATCH] fix db handling when modifying existing color ramp (#6229)

---
 resources/symbology-ng-style.db      | Bin 50176 -> 51200 bytes
 scripts/symbol_xml2db.py             |   2 +-
 src/core/symbology-ng/qgsstylev2.cpp |   4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/symbology-ng-style.db b/resources/symbology-ng-style.db
index 6e7c072395c1d762934805d660c361e26158c50f..e325ef01c035d9f8872f434170829cd1a12a2429 100644
GIT binary patch
delta 743
zcmX|+OK1~O6o%*Alh-7ZN1LRRN7G5ITCMfb)|H^b)H1rt7*|Cw#LiHHlSw+0i*{pM
zS1uG<2Hd(;5EqSIiEEdFxN|FRiVG=pCB}0TDhwar{m;Gsy|eusw|8+@gT=k-a#>5_
zA4!%DC2Zgq*2j6)W;r+jQ##z+X|pvsn1w3DgWIqSvET(vf*iaB1ERriC{d!YWrzeO
zD^Sv6H?!f0n$5ySuldlid(CzFBEd(tC_l!is%fxuJve5y;5|++ErcTKiUv~4wd^PU
zhSTcVjVAAPhU>;!$LV-pv)yeh{MT^Mz;`g)S3-|)Yq~5+QYuV1TP2*)2&bnAGZn(A
zNkX+q&<cbpl~BnOCUb;xmQWfe6vqgK3_(p3CQ^ial8{pf**IZbCS+oSbd+!|LP&;0
zs30NHA4HW9EcO-U8$MVNw_OnzT^7xkMBhcxGB3_vK%r%JB;hgs!XNk@zv5^7gdgw?
zzQ$Mh5})BFcG1H7SjRhf1D9|PE0{x>{bfh}yP*TN6~`j1IyJ9ul}}XnN+UH~ofl)6
zrwxW%P_P2`y7pSnYdWe(>$c@jh@EvyY{;Le&U3@DW%BGujLq?p=zJ`JWiYwdb!<Nq
z!>v3m>Q-8eO<wa-qQvAnH{9eX)44K~)~b;hO5JedqNL_E-F4fSMJV1MlTii3vp4;y
zC?T_5KO&~$Kf*$EZt~Db3>Sr@bx${#IH^0__F+FWn1S>AR|jbr+rL%326O$=)1NE<
E0NnYMYybcN

delta 436
zcmXxey-vbV6bJC0-qH^&p9M=>N{fh!qKK1maUc!4XfzCN1kn&91XN6Pk~$eDNFTzO
zIMLO2Ffl%Z8}S89@DybEo#dW#|L64jr1wPn1{4QoNl6FDFU3QaB31H1kLVZr0Dj;Z
zvd$6nO4s?p$OOR&LMg>@vaW-zbZe*0^PBrt<GOv@nN{9tLpjNEvZjF@nT*uCwMMJf
z`7fOF2_@CX$%+EDFd3Nkr?O6g-jx_umL#~Eb+P4hY<f%R5KcA>unW#ReW>Q|T1~TJ
zomBFZ6E4oo{ey~CwvKa7mAt`{D>9el!PF><3iyz$i7XmOCWS2MNIHoa3X)17x{M^_
zh!#Us2~na*B7(?aWIlw%gGelZNFoyTBM|`!@ko$EmRUq(yvI3$_}wulGEj6y@r#(7
p-nN3bXv0fh_ww>y%9{6gl?-F!46F>d#~}z0_mmyTx$5J$^#?=LRYCv&

diff --git a/scripts/symbol_xml2db.py b/scripts/symbol_xml2db.py
index beba5e34ec1..d7b85b7b956 100644
--- a/scripts/symbol_xml2db.py
+++ b/scripts/symbol_xml2db.py
@@ -36,7 +36,7 @@ _symbol = "CREATE TABLE symbol("\
 
 _colorramp = "CREATE TABLE colorramp("\
         "id INTEGER PRIMARY KEY,"\
-        "name TEXT,"\
+        "name TEXT UNIQUE,"\
         "xml TEXT,"\
         "groupid INTEGER)"
 
diff --git a/src/core/symbology-ng/qgsstylev2.cpp b/src/core/symbology-ng/qgsstylev2.cpp
index 15b70977db7..306b4ad291b 100644
--- a/src/core/symbology-ng/qgsstylev2.cpp
+++ b/src/core/symbology-ng/qgsstylev2.cpp
@@ -187,8 +187,8 @@ bool QgsStyleV2::addColorRamp( QString name, QgsVectorColorRampV2* colorRamp, bo
   if ( !colorRamp || name.isEmpty() )
     return false;
 
-  // delete previous symbol (if any)
-  if ( mSymbols.contains( name ) )
+  // delete previous color ramps (if any)
+  if ( mColorRamps.contains( name ) )
   {
     // TODO remove groups and tags?
     delete mColorRamps.value( name );