fix crash when changing toolbar visibility with empty toolbar.tools

3 files changed, 7 insertions, 4 deletions

diff --git a/src/FbTk/Menu.cc b/src/FbTk/Menu.cc
index ee17204..b0fcb4b 100644
--- a/src/FbTk/Menu.cc
+++ b/src/FbTk/Menu.cc
@@ -506,7 +506,7 @@ void Menu::updateMenu(int active_index) {
 
 void Menu::show() {
 
-    if (isVisible() || !menuitems.size())
+    if (isVisible() || menuitems.empty())
         return;
 
     m_visible = true;
diff --git a/src/FbTk/MenuItem.cc b/src/FbTk/MenuItem.cc
index 82dd155..bc80ca0 100644
--- a/src/FbTk/MenuItem.cc
+++ b/src/FbTk/MenuItem.cc
@@ -34,8 +34,11 @@
 namespace FbTk {
 
 void MenuItem::click(int button, int time) {
-    if (m_command.get() != 0)
-        m_command->execute();
+    if (m_command.get() != 0) {
+        // we need a local variable, since the command may destroy this object
+        RefCount<Command> tmp(m_command);
+        tmp->execute();
+    }
 }
 
 void MenuItem::drawLine(FbDrawable &draw, const MenuTheme &theme, size_t size,
diff --git a/src/FbTk/Subject.cc b/src/FbTk/Subject.cc
index 2b30fd8..08a211c 100644
--- a/src/FbTk/Subject.cc
+++ b/src/FbTk/Subject.cc
@@ -64,7 +64,7 @@ void Subject::notify() {
     m_notify_mode = false;
 
     // remove dead observers
-    if (m_dead_observers.size()) {
+    if (!m_dead_observers.empty()) {
         std::for_each(m_dead_observers.begin(),
                       m_dead_observers.end(),
                       std::bind1st(std::mem_fun(&Subject::detach), this));