X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fplugins%2Fmap.c;h=7a2d66d373f91d7d6d6daeb0a6e6ef101767bef7;hb=cbbad9dcf6bd2b27eca13aa61ab666035859932e;hp=7395ef7792c7598d4220f356090550be70ecade5;hpb=7aefe194719b37d7e03dbbb89e70b95a4455e446;p=grits

diff --git a/src/plugins/map.c b/src/plugins/map.c
index 7395ef7..7a2d66d 100644
--- a/src/plugins/map.c
+++ b/src/plugins/map.c
@@ -88,8 +88,8 @@ static gboolean _load_tile_cb(gpointer _data)
 			(alpha ? GL_RGBA : GL_RGB), GL_UNSIGNED_BYTE, pixels);
 	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
 	glFlush();
 
 	tile->data = tex;
@@ -134,7 +134,8 @@ static gpointer _update_tiles(gpointer _map)
 {
 	g_debug("GisPluginMap: _update_tiles");
 	GisPluginMap *map = _map;
-	g_mutex_lock(map->mutex);
+	if (!g_mutex_trylock(map->mutex))
+		return NULL;
 	gdouble lat, lon, elev;
 	gis_viewer_get_location(map->viewer, &lat, &lon, &elev);
 	gis_tile_update(map->tiles,
@@ -156,6 +157,13 @@ static void _on_location_changed(GisViewer *viewer,
 	g_thread_create(_update_tiles, map, FALSE, NULL);
 }
 
+static gpointer _threaded_init(GisPluginMap *map)
+{
+	_load_tile(map->tiles, map);
+	_update_tiles(map);
+	return NULL;
+}
+
 /***********
  * Methods *
  ***********/
@@ -174,8 +182,7 @@ GisPluginMap *gis_plugin_map_new(GisViewer *viewer)
 	map->viewer = g_object_ref(viewer);
 
 	/* Load initial tiles */
-	_load_tile(map->tiles, map);
-	g_thread_create(_update_tiles, map, FALSE, NULL);
+	g_thread_create((GThreadFunc)_threaded_init, map, FALSE, NULL);
 
 	/* Connect signals */
 	map->sigid = g_signal_connect(map->viewer, "location-changed",