diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-05-05 19:26:48 +0200 |
|---|---|---|
| committer |  Lubomir I. Ivanov <neolit123@gmail.com> | 2018-05-07 13:11:53 +0300 |
| commit | 920ff15f7160cfa6ed8d8d81e0c156dd1d7b27c6 (patch) | |
| tree | 6764713b16bf31fc7a2c17f837e5b038a3427e4f /profile-widget | |
| parent | 450f0992a09b5ef8cc1aa1df5eafd6826e03c4b8 (diff) | |
| download | subsurface-920ff15f7160cfa6ed8d8d81e0c156dd1d7b27c6.tar.gz | |
Planner: don't return static data in fake_dc()
fake_dc() used to return a statically allocated dc with statically
allocated samples. This is of course a questionable practice in
the light of multi-threading / resource ownership. Once these
problems were recognized, the parameter "alloc" was added. If set
to true, the function would still return a statically allocated
dc, but heap-allocated samples, which could then be copied in
a different dc.
All in all an ownership nightmare and a recipie for disaster.
The returned static dc was only used as a pointer to the samples
anyway. There are four callers of fake_dc() and they all have access
to a dc-structure without samples. Therefore, change the semantics
of fake_dc() to fill out the passed in dc. If the caller does
not care about the samples, it can simply reset the sample number
to zero after work.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'profile-widget')
| -rw-r--r-- | profile-widget/profilewidget2.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index 78bd294d4..fa0e98cea 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -592,9 +592,8 @@ void ProfileWidget2::plotDive(struct dive *d, bool force) // data that we have struct divecomputer *currentdc = select_dc(&displayed_dive); Q_ASSERT(currentdc); - if (!currentdc || !currentdc->samples) { - currentdc = fake_dc(currentdc, false); - } + if (!currentdc || !currentdc->samples) + fake_dc(currentdc); bool setpointflag = (currentdc->divemode == CCR) && prefs.pp_graphs.po2 && current_dive; bool sensorflag = setpointflag && prefs.show_ccr_sensors; |