diff options
| author | Brendan Long <self@brendanlong.com> | 2017-10-20 03:29:26 +0300 |
|---|---|---|
| committer | Brendan Long <self@brendanlong.com> | 2017-10-20 03:29:26 +0300 |
| commit | 1d451fa3579760a0b063cb2d1e4968aff31f9c13 (patch) | |
| tree | f8ff7e26b025328c2cea9606a3f512b9597d9f43 | |
| parent | 26e47ba640818f6cd49560b125dd2ece47bcbeda (diff) | |
Don't try to remove event handlers from non-existence event boxes
| -rw-r--r-- | src/Widgets/ArticleRow.vala | 27 | ||||
| -rw-r--r-- | src/Widgets/FeedRow.vala | 3 |
2 files changed, 20 insertions, 10 deletions
diff --git a/src/Widgets/ArticleRow.vala b/src/Widgets/ArticleRow.vala index bf31b1f2..dc614e8b 100644 --- a/src/Widgets/ArticleRow.vala +++ b/src/Widgets/ArticleRow.vala @@ -47,17 +47,26 @@ public class FeedReader.ArticleRow : Gtk.ListBoxRow { ~ArticleRow() { - m_unread_eventbox.enter_notify_event.disconnect(unreadIconEnter); - m_unread_eventbox.leave_notify_event.disconnect(unreadIconLeave); - m_unread_eventbox.button_press_event.disconnect(unreadIconClicked); + if(m_unread_eventbox != null) + { + m_unread_eventbox.enter_notify_event.disconnect(unreadIconEnter); + m_unread_eventbox.leave_notify_event.disconnect(unreadIconLeave); + m_unread_eventbox.button_press_event.disconnect(unreadIconClicked); + } - m_marked_eventbox.enter_notify_event.disconnect(markedIconEnter); - m_marked_eventbox.leave_notify_event.disconnect(markedIconLeave); - m_marked_eventbox.button_press_event.disconnect(markedIconClicked); + if(m_marked_eventbox != null) + { + m_marked_eventbox.enter_notify_event.disconnect(markedIconEnter); + m_marked_eventbox.leave_notify_event.disconnect(markedIconLeave); + m_marked_eventbox.button_press_event.disconnect(markedIconClicked); + } - m_eventBox.enter_notify_event.disconnect(rowEnter); - m_eventBox.leave_notify_event.disconnect(rowLeave); - m_eventBox.button_press_event.disconnect(rowClick); + if(m_eventBox != null) + { + m_eventBox.enter_notify_event.disconnect(rowEnter); + m_eventBox.leave_notify_event.disconnect(rowLeave); + m_eventBox.button_press_event.disconnect(rowClick); + } this.drag_begin.disconnect(onDragBegin); this.drag_data_get.disconnect(onDragDataGet); diff --git a/src/Widgets/FeedRow.vala b/src/Widgets/FeedRow.vala index 540d77fd..d32f7cae 100644 --- a/src/Widgets/FeedRow.vala +++ b/src/Widgets/FeedRow.vala @@ -125,7 +125,8 @@ public class FeedReader.FeedRow : Gtk.ListBoxRow { ~FeedRow() { activateUnreadEventbox(false); - m_eventBox.button_press_event.disconnect(onClick); + if(m_eventBox != null) + m_eventBox.button_press_event.disconnect(onClick); this.drag_begin.disconnect(onDragBegin); this.drag_data_get.disconnect(onDragDataGet); } |