mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 13:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean up the setDive function

Browse source 
* This should never be called with a NULL dive.
* The dc variable was set then never used.
* We now have a unique id for each dive, but we can't simply not
  repopulate the model in setDive as the old comment might make you
  consider, as otherwise the dataModel will reference already freed data
  in pInfo.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-02-10 16:27:05 -08:00
parent 74c75938bf
commit ba6713f0d8
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
qt-ui/profile/diveplotdatamodel.cpp
View file

@ -106,13 +106,8 @@ void DivePlotDataModel::clear()
void DivePlotDataModel::setDive(dive* d, const plot_info& info)
{
// We need a way to find out if the dive setted is the same old dive, but pointers change,
// and there's no UUID, for now, just repopulate everything.
clear();
struct divecomputer *dc = NULL;
if (d)
dc = select_dc(&d->dc);
Q_ASSERT(d != NULL);
diveId = d->id;
pInfo = info;
beginInsertRows(QModelIndex(), 0, pInfo.nr-1);

2
qt-ui/profile/diveplotdatamodel.h
View file

@ -34,4 +34,4 @@ private:
int diveId;
};
#endif
#endif