summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nautilus-window-slot.c5
-rw-r--r--src/nautilus-window.c5
2 files changed, 9 insertions, 1 deletions
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
index 39d62297f..1028d2b93 100644
--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
@@ -181,6 +181,11 @@ nautilus_window_slot_get_restore_tab_data (NautilusWindowSlot *self)
priv = nautilus_window_slot_get_instance_private (self);
+ if (priv->location == NULL)
+ {
+ return NULL;
+ }
+
back_list = g_list_copy_deep (priv->back_list,
(GCopyFunc) g_object_ref,
NULL);
diff --git a/src/nautilus-window.c b/src/nautilus-window.c
index 442dd0e8b..bdfc024a7 100644
--- a/src/nautilus-window.c
+++ b/src/nautilus-window.c
@@ -1620,7 +1620,10 @@ nautilus_window_slot_close (NautilusWindow *window,
}
data = nautilus_window_slot_get_restore_tab_data (slot);
- g_queue_push_head (priv->tab_data_queue, data);
+ if (data != NULL)
+ {
+ g_queue_push_head (priv->tab_data_queue, data);
+ }
close_slot (window, slot, TRUE);