Fix potential crashes during account disabling

1 files changed, 5 insertions, 3 deletions

diff --git a/main/src/ui/conversation_selector/conversation_selector.vala b/main/src/ui/conversation_selector/conversation_selector.vala
index d16ef3ee..4439f443 100644
--- a/main/src/ui/conversation_selector/conversation_selector.vala
+++ b/main/src/ui/conversation_selector/conversation_selector.vala
@@ -120,9 +120,11 @@ public class ConversationSelector : Widget {
         if (rows.has_key(conversation)) {
             conversation.notify["pinned"].disconnect(list_box.invalidate_sort);
 
-            yield rows[conversation].colapse();
-            list_box.remove(rows[conversation]);
-            rows.unset(conversation);
+            ConversationSelectorRow conversation_row;
+            rows.unset(conversation, out conversation_row);
+
+            yield conversation_row.colapse();
+            list_box.remove(conversation_row);
         }
     }