src/map/ozimap.cpp

@@ -272,7 +272,7 @@ bool OziMap::setTileInfo(const QStringList &tiles, const QString &path)
 	for (int i = 0; i < tiles.size(); i++) {
 		const QString &tile = tiles.at(i);
 
-		if (tile.contains(rx)) {
+		if (tile.startsWith("set/") && tile.contains(rx)) {
 			_tile.path = QString(tile).replace(rx, "_%1_%2.");
 
 			if (_tar) {
@@ -283,12 +283,14 @@ bool OziMap::setTileInfo(const QStringList &tiles, const QString &path)
 				_tile.path = path + "/" + _tile.path;
 				_tile.size = QImageReader(path + "/" + tile).size();
 			}
+			if (!_tile.size.isValid()) {
+				_errorString = QString("Error retrieving tile size: "
+				  "%1: Invalid image").arg(QFileInfo(tile).fileName());
+				return false;
+			}
 
-			if (_tile.size.isValid()) {
 			_map.path = QString();
 			return true;
-			} else
-				qWarning("%s: error reading tile image", qPrintable(tile));
 		}
 	}