nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

dont free old color until we have a valid new color

Browse source
This commit is contained in:
fluxgen 2006-06-10 20:23:00 +00:00
parent 7906f1be17
commit 2fdc6ab808
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/FbTk/Color.cc
View file

@ -116,7 +116,7 @@ bool Color::validColorString(const char *color_string, int screen) {
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 @@ void Color::copy(const Color &col_copy) {
setPixel(col_copy.pixel());
return;
}
free();
allocate(col_copy.red()*0xFF,
col_copy.green()*0xFF,
@ -168,6 +166,7 @@ void Color::allocate(unsigned short red, unsigned short green, unsigned short bl
_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));