summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErnestas Kulik <ernestask@src.gnome.org>2016-10-25 20:08:49 +0300
committerErnestas Kulik <ernestask@src.gnome.org>2016-10-26 08:49:35 +0300
commit4b135947939f2d1a7530900be5af21127bdb11aa (patch)
tree5fa9514c062de76c83334877e59469903b56faca
parent71d27a2603d9341d9c370a6eefcb6488ac327c32 (diff)
downloadnautilus-4b135947939f2d1a7530900be5af21127bdb11aa.tar.gz
window: check for an active slot when updating cursor
When updating the cursor, the existence of an active window slot is assumed when checking if it allows stopping. This can cause a crash if the last view is closed while it is still loading. https://bugzilla.gnome.org/show_bug.cgi?id=773499
-rw-r--r--src/nautilus-window.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index be126f476..a9c1d87d8 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -796,7 +796,8 @@ update_cursor (NautilusWindow *window)
slot = nautilus_window_get_active_slot (window);
- if (nautilus_window_slot_get_allow_stop (slot))
+ if (slot != NULL &&
+ nautilus_window_slot_get_allow_stop (slot))
{
GdkDisplay *display;