2 files changed, 7 insertions, 3 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[]) {
     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 @@ Shape::~Shape() {
 }
 
 void Shape::initCorners(int screen_num) {
+    if (!m_win->window())
+        return;
+
     if (s_corners.size() == 0)
         s_corners.resize(ScreenCount(App::instance()->display()));
 
diff --git a/src/Screen.cc b/src/Screen.cc
index cde62cc..8b81529 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -1557,7 +1557,8 @@ void BScreen::removeConfigMenu(FbTk::Menu &menu) {
     if (erase_it != m_configmenu_list.end())
         m_configmenu_list.erase(erase_it);
 
-    setupConfigmenu(*m_configmenu.get());
+    if (!isShuttingdown())
+        setupConfigmenu(*m_configmenu.get());
 
 }