Changeset 2a1e37c2ebaa4d166360a8bed2b730ac8cdc8203

Timestamp:

11/09/09 16:46:22 (4 years ago)

Author:

Benjamin Herr <ben@…>

git-author:

Benjamin Herr <ben@0x539.de> / 2009-11-09T16:11:04Z+0100

Parents:

732c22f27b65ef45c0c1b5142b735804990451ec

Children:

3c40239e8c602c1870208940eaee9b6828b9032c

git-committer:

Benjamin Herr <ben@0x539.de> / 2009-11-09T16:46:22Z+0100

Message:

statusbar: fix crash with removing info messages twice

2009-11-09 Benjamin Herr <ben@…>

• code/core/statusbar.cpp:
• code/core/statusbar.hpp: Add hide_message that only removes a message widget without removing the (then-null) pointer from the m_list. hide_message can be called multiple times, thus avoiding the crash when an info message was removed twice.

Files:

• ChangeLog (modified) (1 diff)
• code/core/statusbar.cpp (modified) (5 diffs)
• code/core/statusbar.hpp (modified) (2 diffs)

ChangeLog

@@ +1 @@
+2009-11-09  Benjamin Herr  <ben@0x539.de>
+
+        * code/core/statusbar.cpp:
+        * code/core/statusbar.hpp: Add hide_message that only removes a
+        message widget without removing the (then-null) pointer from the
+        m_list. hide_message can be called multiple times, thus avoiding the
+        crash when an info message was removed twice.
+
 2009-11-09  Benjamin Herr  <ben@0x539.de>
 

code/core/statusbar.cpp

@@ -63 +63 @@
         }
 
+        bool is_error() { return !m_detail_desc.empty(); }
+
         Gtk::Widget* widget() const { return m_widget; }
 
@@ -74 +76 @@
                             const Preferences& preferences):
         Gtk::HBox(false, 2), m_folder(folder), m_preferences(preferences),
-        m_current_view(NULL), m_position_context_id(0)
+        m_current_view(NULL), m_position_context_id(0), m_visible_messages(0)
 {
         pack_end(m_bar_position, Gtk::PACK_SHRINK);
@@ -102 +104 @@
                               const Glib::ustring& dialog_message)
 {
-        if(m_list.size() >= 12)
-                Gobby::StatusBar::remove_message(m_list.begin());
+        if(m_visible_messages >= 12)
+        {
+                for(MessageHandle iter = m_list.begin();
+                    iter != m_list.end();
+                    ++iter)
+                {
+                        if ((*iter)->is_error())
+                        {
+                                remove_message(iter);
+                                break;
+                        }
+                        else
+                        {
+                                // only hide message because whoever installed
+                                // it is expecting to be able to call
+                                // remove_message on it
+                                hide_message(iter);
+                                if (m_visible_messages < 12)
+                                        break;
+                        }
+                }
+        }
 
         Gtk::HBox* bar = Gtk::manage(new Gtk::HBox);
@@ -124 +146 @@
 
         m_list.push_back(new Message(frame, message, dialog_message));
+        ++m_visible_messages;
         Gobby::StatusBar::MessageHandle iter(--m_list.end());
 
@@ -171 +194 @@
 void Gobby::StatusBar::remove_message(const MessageHandle& handle)
 {
-        remove(*(*handle)->widget());
-        delete *handle;
+        hide_message(handle);
         m_list.erase(handle);
+}
+
+void Gobby::StatusBar::hide_message(const MessageHandle& handle)
+{
+        if(*handle != 0)
+        {
+                g_assert(m_visible_messages > 0);
+                --m_visible_messages;
+                remove(*(*handle)->widget());
+                delete *handle;
+                *handle = 0;
+        }
 }
 

code/core/statusbar.hpp

@@ -62 +62 @@
 
         void remove_message(const MessageHandle& handle);
+        void hide_message(const MessageHandle& handle);
 
         MessageHandle invalid_handle();
@@ -99 +100 @@
         const Preferences& m_preferences;
         MessageList m_list;
+        unsigned int m_visible_messages;
 
         Gtk::Statusbar m_bar_position;