diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2011-02-17 22:29:42 -0500 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2011-02-17 22:29:42 -0500 |
| commit | bdc7f2172f9e8b1c58d3f8a8d90ae157702dde3e (patch) | |
| tree | 344360cf13d73c69508fd9c73af9b9b8ca6a7307 | |
| parent | a58eb87e294c02ec61668ef6d02d701626ef8b98 (diff) | |
| download | nautilus-bdc7f2172f9e8b1c58d3f8a8d90ae157702dde3e.tar.gz | |
window-manage-views: fix an oversight in previous commit
| -rw-r--r-- | 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 e85b3359a..f2963a6d6 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 (); |