Merge pull request linuxmint#1395 from leigh123linux/dont_reload_whil…

…e_reload Don't reload while a reload is ongoing
Stefan-Olt · Feb 7, 2017 · 66ff168 · 66ff168
2 parents 340228c + c4af242
commit 66ff168
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/nemo-window-manage-views.c b/src/nemo-window-manage-views.c
@@ -1868,6 +1868,13 @@ nemo_window_slot_reload (NemoWindowSlot *slot)
 		return;
 	}
 
+	if (slot->pending_location != NULL
+	    || slot->content_view == NULL
+	    || nemo_view_get_loading (slot->content_view)) {
+		/* there is a reload in flight */
+		return;
+	}
+
 	/* peek_slot_field (window, location) can be free'd during the processing
 	 * of begin_location_change, so make a copy
 	 */