[Rawstudio-commit] r2066 - trunk/src

[Anders Brander]

Author: abrander
Date: 2008-10-13 21:49:24 +0200 (Mon, 13 Oct 2008)
New Revision: 2066

Modified:
   trunk/src/gtk-interface.c
Log:
Made sure that the GDK lock is acquired before calling rs_store_load_directory().

Modified: trunk/src/gtk-interface.c
===================================================================
--- trunk/src/gtk-interface.c	2008-10-13 19:44:34 UTC (rev 2065)
+++ trunk/src/gtk-interface.c	2008-10-13 19:49:24 UTC (rev 2066)
@@ -1085,6 +1085,9 @@
 		lwd = rs_conf_get_string(CONF_LWD);
 		if (!lwd)
 			lwd = g_get_current_dir();
+
+		/* rs_store_load_directory() MUST have the GDK lock! */
+		gdk_threads_enter();
 		if (rs_store_load_directory(rs->store, lwd))
 		{
 			gint last_priority_page = 0;
@@ -1096,6 +1099,7 @@
 		}
 		else
 			rs_conf_set_integer(CONF_LAST_PRIORITY_PAGE, 0);
+		gdk_threads_leave();
 		rs_dir_selector_expand_path(RS_DIR_SELECTOR(dir_selector), lwd);
 		g_free(lwd);
 	}