lang/gpxsee_fi.ts

@@ -587,7 +587,7 @@
     <message>
         <location filename="../src/GUI/gui.cpp" line="487"/>
         <source>Show local DEM tiles</source>
-        <translation>Näytä paikalliset DEM-laatat</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="490"/>
@@ -699,7 +699,7 @@
     <message>
         <location filename="../src/GUI/gui.cpp" line="695"/>
         <source>Layers</source>
-        <translation>Kerrokset</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="721"/>
@@ -850,12 +850,12 @@
     <message>
         <location filename="../src/GUI/gui.cpp" line="1998"/>
         <source>DEM tiles download limit exceeded. If you really need data for such a huge area, download the files manually.</source>
-        <translation>DEM-laattojen latausraja ylitetty. Jos todella tarvitset tietoja niin suurelta alueelta, lataa tiedostot manuaalisesti.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="2014"/>
         <source>Could not download all required DEM files.</source>
-        <translation>Kaikkia vaadittuja DEM-tiedostoja ei voitu ladata.</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="2048"/>
@@ -898,12 +898,12 @@
     <message>
         <location filename="../src/GUI/gui.cpp" line="476"/>
         <source>Download data DEM</source>
-        <translation>Lataa data-DEM</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="482"/>
         <source>Download map DEM</source>
-        <translation>Lataa kartta-DEM</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/GUI/gui.cpp" line="762"/>
@@ -961,7 +961,7 @@
     <message>
         <location filename="../src/GUI/gui.cpp" line="1978"/>
         <source>Clear &quot;%1&quot; tile cache?</source>
-        <translation>Tyhjennetäänkö &quot;%1&quot; ruutuvälimuisti?</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
         <location filename="../src/GUI/gui.cpp" line="2001"/>

src/map/ENC/atlasdata.cpp

@@ -6,23 +6,31 @@ bool AtlasData::pointCb(MapEntry *map, void *context)
 {
 	PointCTX *ctx = (PointCTX*)context;
 
-	map->lock.lock();
+start:
-
 	ctx->cacheLock.lock();
+
 	MapData *cached = ctx->cache.object(map->path);
+
 	if (!cached) {
 		ctx->cacheLock.unlock();
 
+		if (map->lock.tryLock()) {
 			MapData *data = new MapData(map->path);
 			data->points(ctx->rect, ctx->points);
 
 			ctx->cacheLock.lock();
 			ctx->cache.insert(map->path, data);
+
+			map->lock.unlock();
+		} else {
+			map->lock.lock();
+			map->lock.unlock();
+			goto start;
+		}
 	} else
 		cached->points(ctx->rect, ctx->points);
 
 	ctx->cacheLock.unlock();
-	map->lock.unlock();
 
 	return true;
 }
@@ -31,26 +39,34 @@ bool AtlasData::polyCb(MapEntry *map, void *context)
 {
 	PolyCTX *ctx = (PolyCTX*)context;
 
-	map->lock.lock();
+start:
-
 	ctx->cacheLock.lock();
+
 	MapData *cached = ctx->cache.object(map->path);
+
 	if (!cached) {
 		ctx->cacheLock.unlock();
 
+		if (map->lock.tryLock()) {
 			MapData *data = new MapData(map->path);
 			data->polygons(ctx->rect, ctx->polygons);
 			data->lines(ctx->rect, ctx->lines);
 
 			ctx->cacheLock.lock();
 			ctx->cache.insert(map->path, data);
+
+			map->lock.unlock();
+		} else {
+			map->lock.lock();
+			map->lock.unlock();
+			goto start;
+		}
 	} else {
 		cached->polygons(ctx->rect, ctx->polygons);
 		cached->lines(ctx->rect, ctx->lines);
 	}
 
 	ctx->cacheLock.unlock();
-	map->lock.unlock();
 
 	return true;
 }