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

get_gas_at_time needs to always give us a valid gas

Browse source 
Before this function was changed it was really supposed to just change a
gas that was passed in in case there was an event that changed the mix -
but with the new name the caller will assume that they get a valid gasmix.
And promptly we had one caller that didn't initialize gas to be based on
the first cylinder before calling get_gas_at_time().

Instead of adding yet one more spot that knows about the oddity of the old
API I simply changed get_gas_at_time() to do what it name appears to imply
and fixed the other callers not to bother to initialize the gasmix.

Fixes #647

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-07-18 18:37:28 -07:00
parent 359613210b
commit 17bcd1bc60
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
qt-ui/diveplanner.cpp
View file

@ -106,8 +106,7 @@ void DivePlannerPointsModel::loadFromDive(dive *d)
{
CylindersModel::instance()->updateDive();
duration_t lasttime = {};
// we start with the first gas and see if it was changed
struct gasmix gas = d->cylinder[0].gasmix;
struct gasmix gas;
for (int i = 0; i < d->dc.samples - 1; i++) {
const sample &s = d->dc.sample[i];
if (s.time.seconds == 0)