root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2025-07-19 21:34:24 +02:00
Code Issues Projects Releases Activity

Yet another map load crash fix

Browse Source
This commit is contained in:
Martin Tůma
2020-12-10 01:09:23 +01:00
parent 743a937f41
commit 0f03ef4af7
5 changed files with 16 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/GUI/mapview.cpp
View File

@ -279,11 +279,9 @@ void MapView::loadMaps(const QList<MapAction *> &maps)
for (int i = 0; i < maps.size(); i++) {
MapAction *a = maps.at(i);
Map *map = a->data().value<Map*>();
if (map->isReady()) {
MapItem *mi = addMap(map);
connect(mi, SIGNAL(triggered()), a, SLOT(trigger()));
} else
connect(a, SIGNAL(loaded()), this, SLOT(mapLoaded()));
Q_ASSERT(map->isReady());
MapItem *mi = addMap(map);
connect(mi, SIGNAL(triggered()), a, SLOT(trigger()));
}
if (fitMapZoom() != zoom)
@ -296,29 +294,6 @@ void MapView::loadMaps(const QList<MapAction *> &maps)
centerOn(contentCenter());
}
void MapView::mapLoaded()
{
MapAction *action = static_cast<MapAction*>(QObject::sender());
Map *map = action->data().value<Map*>();
if (!map->isValid())
return;
int zoom = _map->zoom();
MapItem *mi = addMap(map);
connect(mi, SIGNAL(triggered()), action, SLOT(trigger()));
if (fitMapZoom() != zoom)
rescale();
else
updatePOIVisibility();
updateZValues(_areas);
centerOn(contentCenter());
}
int MapView::fitMapZoom() const
{
RectC br = _tr | _rr | _wr | _ar;