From 3610039e74498aa1278f76523f30b37f6c69fef2 Mon Sep 17 00:00:00 2001 From: naxuroqa Date: Fri, 21 Dec 2018 14:06:40 +0100 Subject: [PATCH] VENOM-466: Fix crash when right clicking empty contact list --- src/view/ContactListWidget.vala | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/view/ContactListWidget.vala b/src/view/ContactListWidget.vala index c7f4787..bd849d6 100644 --- a/src/view/ContactListWidget.vala +++ b/src/view/ContactListWidget.vala @@ -112,11 +112,13 @@ namespace Venom { if (ev.type == Gdk.EventType.BUTTON_PRESS && ev.button == 3) { logger.d("right mouse clicked"); var row = contact_list.get_row_at_y((int) ev.y); - var contact = contact_list_model.get_object(row.get_index()) as IContact; - var menu = view_model.popup_menu(contact); - var popover = new Gtk.Popover.from_model(row, menu); - popover.popup(); - return true; + if (row != null) { + var contact = contact_list_model.get_object(row.get_index()) as IContact; + var menu = view_model.popup_menu(contact); + var popover = new Gtk.Popover.from_model(row, menu); + popover.popup(); + return true; + } } return false; }