[nautilus] window-manage-views: fix an oversight in previous commit

[Cosimo Cecchi <cosimoc src gnome org>]

commit bdc7f2172f9e8b1c58d3f8a8d90ae157702dde3e
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Thu Feb 17 22:29:42 2011 -0500

    window-manage-views: fix an oversight in previous commit

 src/nautilus-window-manage-views.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index e85b335..f2963a6 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -442,11 +442,11 @@ nautilus_window_slot_open_location_full (NautilusWindowSlot *slot,
 
         target_window = NULL;
 	target_slot = NULL;
-	use_same = TRUE;
 
 	old_uri = nautilus_window_slot_get_location_uri (slot);
 	if (old_uri == NULL) {
 		old_uri = g_strdup ("(none)");
+		use_same = TRUE;
 	}
 	new_uri = g_file_get_uri (location);
 
@@ -459,11 +459,10 @@ nautilus_window_slot_open_location_full (NautilusWindowSlot *slot,
 		    (flags & NAUTILUS_WINDOW_OPEN_FLAG_NEW_TAB) != 0));
 
 	is_desktop = NAUTILUS_IS_DESKTOP_WINDOW (window);
-	old_location = nautilus_window_slot_get_location (slot);
+	use_same |= g_settings_get_boolean (nautilus_preferences, NAUTILUS_PREFERENCES_ALWAYS_USE_BROWSER) ||
+		(is_desktop && !nautilus_desktop_window_loaded (NAUTILUS_DESKTOP_WINDOW (window)));
 
-	if (is_desktop && nautilus_desktop_window_loaded (NAUTILUS_DESKTOP_WINDOW (window))) {
-		use_same = FALSE;
-	}
+	old_location = nautilus_window_slot_get_location (slot);
 
 	app = nautilus_application_dup_singleton ();