diff options
author | Ernestas Kulik <ekulik@redhat.com> | 2019-06-15 07:57:29 +0200 |
---|---|---|
committer | Ernestas Kulik <ekulik@redhat.com> | 2019-08-06 16:11:48 +0200 |
commit | 45abd6eb15ed674e302ac9908a7e24a6dd1c491d (patch) | |
tree | 7e0d4516cfe0a98c4348b53a13d70c6ffcd9e4ae | |
parent | 36eff64dc31bb76aa313ef39833f818f260849b3 (diff) | |
download | nautilus-45abd6eb15ed674e302ac9908a7e24a6dd1c491d.tar.gz |
window: Don’t mix and match enum types
Using NautilusNewTabPosition as NautilusWindowOpenFlags can result in a
failed assertion when the value is equal to 1
(NAUTILUS_WINDOW_OPEN_FLAG_NEW_WINDOW/NAUTILUS_NEW_TAB_POSITION_END).
Additionally, nautilus_window_open_location_full() checks the new tab
position, so it is simply pointless to do that beforehand.
Fixes https://gitlab.gnome.org/GNOME/nautilus/issues/953
-rw-r--r-- | src/nautilus-window.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/nautilus-window.c b/src/nautilus-window.c index b039940fa..89d492a76 100644 --- a/src/nautilus-window.c +++ b/src/nautilus-window.c @@ -742,7 +742,6 @@ void nautilus_window_new_tab (NautilusWindow *window) { NautilusWindowSlot *current_slot; - NautilusWindowOpenFlags flags; GFile *location; g_autofree gchar *uri = NULL; @@ -751,8 +750,6 @@ nautilus_window_new_tab (NautilusWindow *window) if (location != NULL) { - flags = g_settings_get_enum (nautilus_preferences, NAUTILUS_PREFERENCES_NEW_TAB_POSITION); - uri = g_file_get_uri (location); if (eel_uri_is_search (uri)) { @@ -763,8 +760,9 @@ nautilus_window_new_tab (NautilusWindow *window) g_object_ref (location); } - flags |= NAUTILUS_WINDOW_OPEN_FLAG_NEW_TAB; - nautilus_window_open_location_full (window, location, flags, NULL, NULL); + nautilus_window_open_location_full (window, location, + NAUTILUS_WINDOW_OPEN_FLAG_NEW_TAB, + NULL, NULL); g_object_unref (location); } } @@ -1202,10 +1200,7 @@ action_restore_tab (GSimpleAction *action, return; } - flags = g_settings_get_enum (nautilus_preferences, NAUTILUS_PREFERENCES_NEW_TAB_POSITION); - - flags |= NAUTILUS_WINDOW_OPEN_FLAG_NEW_TAB; - flags |= NAUTILUS_WINDOW_OPEN_FLAG_DONT_MAKE_ACTIVE; + flags = NAUTILUS_WINDOW_OPEN_FLAG_NEW_TAB | NAUTILUS_WINDOW_OPEN_FLAG_DONT_MAKE_ACTIVE; data = g_queue_pop_head (window->tab_data_queue); |