mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Map: don't fully reset model on selection change

Browse source 
When changing the selection the MapLocationModel was reset.
This lead to crashes on Qt-5.9 which are due to QML accessing
data that was freed during model reset. This putative Qt bug
doesn't happen on newer Qt versions. At least Qt-5.12 is known
to work.

Instead of fighting the bug, let's simply not reset the model
but send a dataChanged() for every element of the MapLocationModel.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-08-30 16:51:59 +02:00 • committed by Dirk Hohndel
parent cabe70be80
commit b39f2406c6
7 changed files with 25 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
qt-models/maplocationmodel.cpp
View file

@ -150,6 +150,15 @@ static bool hasSelectedDive(const dive_site *ds)
[] (const dive *d) { return d->selected; });
}
void MapLocationModel::selectionChanged()
{
if (m_mapLocations.isEmpty())
return;
for(MapLocation *m: m_mapLocations)
m->m_selected = m_selectedDs.contains(m->divesite());
emit dataChanged(createIndex(0, 0), createIndex(m_mapLocations.size() - 1, 0));
}
void MapLocationModel::reload(QObject *map)
{
beginResetModel();