aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-09-26 03:51:37 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-09-26 03:51:37 (GMT)
commitbb70b144320084e99961f4537cb2cf3f0d6b72da (patch)
tree3330ae3b9f67a58263f5405cab15a2c2fe3b3eb5 /src/FbTk
parent4018d088183bd77a2f8b6a775d05e849be3ffa75 (diff)
downloadfluxbox-bb70b144320084e99961f4537cb2cf3f0d6b72da.zip
fluxbox-bb70b144320084e99961f4537cb2cf3f0d6b72da.tar.bz2
fix rounded corners on restart
Diffstat (limited to 'src/FbTk')
-rw-r--r--src/FbTk/Shape.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/FbTk/Shape.cc b/src/FbTk/Shape.cc
index 6cc46f8..7c14832 100644
--- a/src/FbTk/Shape.cc
+++ b/src/FbTk/Shape.cc
@@ -56,9 +56,9 @@ Pixmap makePixmap(FbWindow &drawable, const unsigned char rows[]) {
56 Display *disp = App::instance()->display(); 56 Display *disp = App::instance()->display();
57 57
58 const size_t data_size = 8 * 8; 58 const size_t data_size = 8 * 8;
59 // we use calloc here so we get consistent C alloc/free with XDestroyImage 59 // we use malloc here so we get consistent C alloc/free with XDestroyImage
60 // and no warnings in valgrind :) 60 // and no warnings in valgrind :)
61 char *data = (char *)calloc(data_size, sizeof (char)); 61 char *data = (char *)malloc(data_size * sizeof (char));
62 if (data == 0) 62 if (data == 0)
63 return 0; 63 return 0;
64 64
@@ -141,6 +141,9 @@ Shape::~Shape() {
141} 141}
142 142
143void Shape::initCorners(int screen_num) { 143void Shape::initCorners(int screen_num) {
144 if (!m_win->window())
145 return;
146
144 if (s_corners.size() == 0) 147 if (s_corners.size() == 0)
145 s_corners.resize(ScreenCount(App::instance()->display())); 148 s_corners.resize(ScreenCount(App::instance()->display()));
146 149