diff options
| author | Monsta <[email protected]> | 2015-03-18 16:10:04 +0300 |
|---|---|---|
| committer | Monsta <[email protected]> | 2015-03-18 16:25:54 +0300 |
| commit | 0de3e198db38b4e819159d958148bb386430d4dc (patch) | |
| tree | c537306046e71868326456854c2fcb6ff53271dc | |
| parent | 568d02d53aecd1d9b8163a7f8c48d51744e03390 (diff) | |
| download | caja-0de3e198db38b4e819159d958148bb386430d4dc.tar.bz2 caja-0de3e198db38b4e819159d958148bb386430d4dc.tar.xz | |
places-sidebar: fix crash
taken from upstream commits:
https://git.gnome.org/browse/nautilus/commit/?id=cda2c75df4b95a481e8b774081ec1240d47fa45f
https://git.gnome.org/browse/nautilus/commit/?id=4764a856c7a6e5a84d4067e7b105c09a93ffdbe4
| -rw-r--r-- | src/caja-places-sidebar.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/caja-places-sidebar.c b/src/caja-places-sidebar.c index 0e1ce9c4..f7974970 100644 --- a/src/caja-places-sidebar.c +++ b/src/caja-places-sidebar.c @@ -1455,7 +1455,7 @@ reorder_bookmarks (CajaPlacesSidebar *sidebar, /* Get the selected path */ if (!get_selected_iter (sidebar, &iter)) - g_assert_not_reached (); + return; gtk_tree_model_get (GTK_TREE_MODEL (sidebar->filter_model), &iter, PLACES_SIDEBAR_COLUMN_ROW_TYPE, &type, @@ -1520,7 +1520,9 @@ drag_data_received_callback (GtkWidget *widget, } /* Compute position */ - compute_drop_position (tree_view, x, y, &tree_path, &tree_pos, sidebar); + success = compute_drop_position (tree_view, x, y, &tree_path, &tree_pos, sidebar); + if (!success) + goto out; success = FALSE; |