diff options
| author | Ernestas Kulik <ernestask@gnome.org> | 2018-09-25 09:26:00 +0300 |
|---|---|---|
| committer | Ernestas Kulik <ernestask@gnome.org> | 2018-10-02 17:00:36 +0300 |
| commit | d6f61a88237bc1396f1f054393a16e1425f59445 (patch) | |
| tree | 5edda1493f5092b04a2469854d5a015f83d314d6 /src/nautilus-window-slot.c | |
| parent | 0009d0e771f1a7cb9adf12e78d66aefcccc766b6 (diff) | |
| download | nautilus-d6f61a88237bc1396f1f054393a16e1425f59445.tar.gz | |
application: Check pending location on clone-window
Cloning the window while its location is null (i.e. the attributes of
the pending location file are still being waited on) results in a failed
assertion, which is less than desirable. That can be fixed by
preemptively checking if there is a pending location on the slot and
using that in the new window.
Fixes https://gitlab.gnome.org/GNOME/nautilus/issues/649
Diffstat (limited to 'src/nautilus-window-slot.c')
| -rw-r--r-- | src/nautilus-window-slot.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c index 169f1fb6e..56b63895b 100644 --- a/src/nautilus-window-slot.c +++ b/src/nautilus-window-slot.c @@ -1884,7 +1884,6 @@ got_file_info_for_view_selection_callback (NautilusFile *file, NautilusFile *viewed_file; NautilusView *view; GFile *location; - NautilusApplication *app; self = callback_data; @@ -3257,6 +3256,18 @@ nautilus_window_slot_get_location (NautilusWindowSlot *self) return priv->location; } +GFile * +nautilus_window_slot_get_pending_location (NautilusWindowSlot *self) +{ + NautilusWindowSlotPrivate *priv; + + g_return_val_if_fail (NAUTILUS_IS_WINDOW_SLOT (self), NULL); + + priv = nautilus_window_slot_get_instance_private (self); + + return priv->pending_location; +} + const gchar * nautilus_window_slot_get_title (NautilusWindowSlot *self) { |