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

fix merge problem

Browse source 
I guess I get what I deserve.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2022-03-13 15:33:04 -07:00
parent ed83f6ce32
commit 6354f97321
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
commands/command_edit.cpp
View file

@ -1362,8 +1362,9 @@ void EditCylinder::undo()
}
EditSensors::EditSensors(int toCylinderIn, int fromCylinderIn)
: dc(current_dc), d(current_dive), toCylinder(toCylinderIn), fromCylinder(fromCylinderIn)
: d(current_dive), toCylinder(toCylinderIn), fromCylinder(fromCylinderIn)
{
const struct divecomputer *dc = get_dive_dc(d, dc_number);
if (!d || !dc)
return;