summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorlukefromdc <[email protected]>2018-04-05 22:12:40 -0400
committerlukefromdc <[email protected]>2018-04-06 13:50:50 -0400
commita00bad28d88e1af9f8290192ec90287a42f736ef (patch)
treefe653466fedb61295dae1d81a6b74e0189da026a /src
parent9ea3b711a6a24d4b68231711129982a34938479b (diff)
downloadcaja-a00bad28d88e1af9f8290192ec90287a42f736ef.tar.bz2
caja-a00bad28d88e1af9f8290192ec90287a42f736ef.tar.xz
Fix warnings from HiDPI commits
*caja-pathbar: fix warning,and in the process maybe fix occasional segfaults on opening mounted volumes from the desktop *caja-icon-info: Stop gdk_cairo_surface_create_from_pixbuf: assertion 'GDK_IS_PIXBUF (pixbuf)' failed warning by handling NULL return from function finding the pixbuf caja-icon-canvas-item-c: do not use g_object_unref where it does not work Stop the g_object_unref: assertion 'G_IS_OBJECT (object)' failed warnings on closing icon views
Diffstat (limited to 'src')
-rw-r--r--src/caja-pathbar.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/caja-pathbar.c b/src/caja-pathbar.c
index fe0a0590..34a8438c 100644
--- a/src/caja-pathbar.c
+++ b/src/caja-pathbar.c
@@ -1538,9 +1538,13 @@ setup_file_path_mounted_mount (GFile *location, ButtonData *button_data)
GFile *root, *default_location;
gint scale;
+ /* Return false if button has not been set up yet or has been destroyed*/
+ if (!button_data->button)
+ return FALSE;
result = FALSE;
volume_monitor = g_volume_monitor_get ();
mounts = g_volume_monitor_get_mounts (volume_monitor);
+
scale = gtk_widget_get_scale_factor (GTK_WIDGET (button_data->button));
for (l = mounts; l != NULL; l = l->next)
{