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 in EditSensors

Browse source 
Need to save the current dc as a member variable so we can apply redo
and undo to the correct dc later.

Signed-off-by: Michael Andreen <michael@andreen.dev>
This commit is contained in:
Michael Andreen 2022-03-14 16:57:13 +01:00 • committed by Dirk Hohndel
parent 6354f97321
commit 451be04400
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
commands/command_edit.h
View file

@ -446,8 +446,8 @@ public:
EditSensors(int cylIndex, int fromCylinder);
private:
struct divecomputer *dc;
struct dive *d;
struct divecomputer *dc;
int toCylinder;
int fromCylinder;
void mapSensors(int toCyl, int fromCyl);