M src/FbTk/Color.cc → src/FbTk/Color.cc

@@ -116,7 +116,7 @@ 
     return XParseColor(disp, colm, color_string_tmp.c_str(), &color) != 0;
 }
 
-Color &Color::operator  = (const Color &col_copy) {
+Color &Color::operator = (const Color &col_copy) {
     // check for aliasing
     if (this == &col_copy)
         return *this;
@@ -144,8 +144,6 @@ setRGB(col_copy.red(), col_copy.green(), col_copy.blue());
         setPixel(col_copy.pixel());
         return;
     }
-
-    free();
 		
     allocate(col_copy.red()*0xFF, 
              col_copy.green()*0xFF,
@@ -168,6 +166,7 @@ if (!XAllocColor(disp, DefaultColormap(disp, screen), &color)) {
         _FB_USES_NLS;
         cerr<<"FbTk::Color: "<<_FBTKTEXT(Error, ColorAllocation, "Allocation error.", "XAllocColor failed...")<<endl;
     } else {
+        free();
         setRGB(maxValue(color.red),
                maxValue(color.green),
                maxValue(color.blue));