Changeset 404dd8435cecf6f9de866b9b0d51b3db4bb1aa5c

Timestamp:

09/23/08 22:52:30 (5 years ago)

Author:

Armin Burgmeier <armin@…>

Parents:

3a148d02289248eaa372bf5e6fda1252df1bc646

Children:

2c6703406e49628a79694cd0405753ff63b26880

git-committer:

Armin Burgmeier <armin@arbur.net> / 2008-09-23T22:52:30Z+0200

Message:

FIxed a crash in the JoinDialog? when the avahi daemon is not running

2008-09-23 Armin Burgmeier <armin@…>

• src/joindialog.cpp: Fixed a crash introduced in the last version that occurs when using the dialog without the avahi daemon being running (Bug #266, Yannick_LM)

Files:

• ChangeLog (modified) (1 diff)
• src/joindialog.cpp (modified) (2 diffs)

ChangeLog

@@ +1 @@
+2008-09-23  Armin Burgmeier  <armin@0x539.de>
+
+        * src/joindialog.cpp: Fixed a crash introduced in the last version
+        that occurs when using the dialog without the avahi daemon being
+        running (Bug #266, Yannick_LM)
+
 2008-09-11  Philipp Kern  <phil@0x539.de>
 

src/joindialog.cpp

@@ -187 +187 @@
 {
 #ifdef WITH_ZEROCONF
-        const Gtk::TreeModel::Children& children = m_session_list->children();
-        for(Gtk::TreeIter iter = children.begin();
-            iter != children.end(); ++ iter)
-        {
-                net6::address* addr = (*iter)[m_session_cols.address];
-                delete addr;
+        if(m_session_list)
+        {
+                const Gtk::TreeModel::Children& children =
+                        m_session_list->children();
+
+                for(Gtk::TreeIter iter = children.begin();
+                    iter != children.end(); ++ iter)
+                {
+                        net6::address* addr = (*iter)[m_session_cols.address];
+                        delete addr;
+                }
         }
 #endif
@@ -210 +215 @@
 {
 #ifdef WITH_ZEROCONF
+        if(!m_session_list)
+                return NULL;
+
         // m_session_view.get_selection() is not const, therefore this function
         // cannot be const.
         Gtk::TreeModel::iterator iter =
                 m_session_view.get_selection()->get_selected();
-        if(iter != m_session_list->children().end())
+        if(iter && iter != m_session_list->children().end())
         {
                 // Use address with port info if selected from zeroconf