summaryrefslogtreecommitdiffstats
path: root/profile.c
diff options
context:
space:
mode:
authorGravatar Linus Torvalds <torvalds@linux-foundation.org>2013-02-04 16:21:47 +1100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-02-04 06:48:57 +1100
commit618fcc8cbc64984b55e19b761788970d9fb4546e (patch)
treec01bd299bca60b3adc357af9785b5bd9d7a69b83 /profile.c
parentf507b05927fccc228951c6aa06df1f2a4a01de0a (diff)
downloadsubsurface-618fcc8cbc64984b55e19b761788970d9fb4546e.tar.gz
Fix dive computer interleaving so it works again
Merging two different dives by interleaving dive computer data got broken by the multi-dive-computer code in commit b6c9301e5847 ("Move more dive computer filled data to the divecomputer structure") which added a lot more entries to the dive computer data structure, and then copied the resulting structure incorrectly. Make sure we don't copy the events and samples allocations when we copy all the other fields of the divecomputer. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'profile.c')
0 files changed, 0 insertions, 0 deletions