-misc minor fixes

1 files changed, 8 insertions, 3 deletions

diff --git a/src/conversation/gnunet-conversation-gtk_contacts.c b/src/conversation/gnunet-conversation-gtk_contacts.c
index b080c8fc..531d5256 100644
--- a/src/conversation/gnunet-conversation-gtk_contacts.c
+++ b/src/conversation/gnunet-conversation-gtk_contacts.c
@@ -28,8 +28,8 @@
  */
 #include "gnunet-conversation-gtk.h"
 #include "gnunet-conversation-gtk_contacts.h"
-#include "gnunet-conversation-gtk_egos.h"
 #include "gnunet-conversation-gtk_phone.h"
+#include "gnunet-conversation-gtk_zones.h"
 
 
 /**
@@ -252,15 +252,20 @@ gnunet_conversation_gtk_contacts_zone_combobox_changed_cb (GtkComboBox *widget,
   struct GNUNET_IDENTITY_Ego *ego;
   const struct GNUNET_CRYPTO_EcdsaPrivateKey *temp_zone_pkey;
 
-  ego = GCG_EGOS_get_selected_ego ();
-  temp_zone_pkey = GNUNET_IDENTITY_ego_get_private_key (ego);
   if (NULL != zone_mon)
   {
     GNUNET_NAMESTORE_zone_monitor_stop (zone_mon);
     zone_mon = NULL;
   }
   gtk_list_store_clear (contacts_liststore);
+  ego = GCG_ZONES_get_selected_zone ();
+  if (NULL == ego)
+  {
+    /* ego deselected (likely shutdown) */
+    return;
+  }
   gtk_widget_hide (contacts_treeview);
+  temp_zone_pkey = GNUNET_IDENTITY_ego_get_private_key (ego);
   zone_mon = GNUNET_NAMESTORE_zone_monitor_start (GCG_get_configuration (),
                                                   temp_zone_pkey,
                                                   GNUNET_YES,