fix rounded corners on restart
Mark Tiefenbruck mark@fluxbox.org
3 files changed,
10 insertions(+),
3 deletions(-)
M
src/FbTk/Shape.cc
→
src/FbTk/Shape.cc
@@ -56,9 +56,9 @@
Display *disp = App::instance()->display(); const size_t data_size = 8 * 8; - // we use calloc here so we get consistent C alloc/free with XDestroyImage + // we use malloc here so we get consistent C alloc/free with XDestroyImage // and no warnings in valgrind :) - char *data = (char *)calloc(data_size, sizeof (char)); + char *data = (char *)malloc(data_size * sizeof (char)); if (data == 0) return 0;@@ -141,6 +141,9 @@ #endif // SHAPE
} void Shape::initCorners(int screen_num) { + if (!m_win->window()) + return; + if (s_corners.size() == 0) s_corners.resize(ScreenCount(App::instance()->display()));
M
src/Screen.cc
→
src/Screen.cc
@@ -1557,7 +1557,8 @@ FbTk::Select2nd<Configmenus::value_type>()));
if (erase_it != m_configmenu_list.end()) m_configmenu_list.erase(erase_it); - setupConfigmenu(*m_configmenu.get()); + if (!isShuttingdown()) + setupConfigmenu(*m_configmenu.get()); }