mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-19 14:25:27 +00:00
Code Issues Projects Releases Packages Wiki Activity
subsurface/core
History
Linus Torvalds 9084bbae57 Fix event merging when interleaving dives 
The core to avoid adding redundant gas switch events was completely
buggered, and caused the result list to be corrupted if it ever
triggered.  This should fix it.

Fixes: b5de08b7 ("No gas change event on merging dives with same gas")
Reported-by: Jan Mulder <jlmulder@xs4all.nl>
Cc: Miika Turkia <miika.turkia@gmail.com>
Cc: Dirk Hohndel <dirk@hohndel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2017-04-30 12:38:09 -07:00
..
subsurface-qt Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
android.cpp Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
checkcloudconnection.cpp Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
checkcloudconnection.h Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
cloudstorage.cpp Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
cloudstorage.h Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
CMakeLists.txt Revert "Add a simple cp2130 libusb driver" 2016-09-22 14:56:31 -07:00
cochran.c Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
cochran.h Move subsurface-core to core and qt-mobile to mobile-widgets 2016-04-04 22:33:58 -07:00
color.cpp Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
color.h Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
compressibility.r Move subsurface-core to core and qt-mobile to mobile-widgets 2016-04-04 22:33:58 -07:00
configuredivecomputer.cpp Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
configuredivecomputer.h Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
configuredivecomputerthreads.cpp Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
configuredivecomputerthreads.h Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
datatrak.c Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
datatrak.h Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
deco.c Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
deco.h Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
device.c Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
device.h Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
devicedetails.cpp Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
devicedetails.h Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
display.h Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
dive.c Fix event merging when interleaving dives 2017-04-30 12:38:09 -07:00
dive.h Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
divecomputer.cpp Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
divecomputer.h Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
divelist.c Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
divelist.h Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
divelogexportlogic.cpp Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
divelogexportlogic.h Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
divesite.c Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
divesite.cpp Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
divesite.h Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
divesitehelpers.cpp Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
divesitehelpers.h Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
equipment.c Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
exif.cpp Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
exif.h Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
file.c Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
file.h Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
gas-model.c Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
gaspressures.c Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
gaspressures.h Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
gettext.h Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
gettextfromc.cpp Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
gettextfromc.h Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
git-access.c Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
git-access.h Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
gpslocation.cpp Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
gpslocation.h Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
helpers.h Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
imagedownloader.cpp Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
imagedownloader.h Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
isocialnetworkintegration.cpp Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
isocialnetworkintegration.h Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
libdivecomputer.c Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
libdivecomputer.h Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
linux.c Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
liquivision.c Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
load-git.c Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
macos.c Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
membuffer.c Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
membuffer.h Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
metrics.cpp Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
metrics.h Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
ostctools.c Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
parse-xml.c Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
planner.c Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
planner.h Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
pluginmanager.cpp Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
pluginmanager.h Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
pref.h Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
prefs-macros.h Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
profile.c Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
profile.h Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
qt-gui.h Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
qt-init.cpp Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
qthelper.cpp Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
qthelper.h Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
qthelperfromc.h Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
qtserialbluetooth.cpp Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
save-git.c Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
save-html.c Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
save-html.h Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
save-xml.c Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
serial_ftdi.c Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
sha1.c Move subsurface-core to core and qt-mobile to mobile-widgets 2016-04-04 22:33:58 -07:00
sha1.h Move subsurface-core to core and qt-mobile to mobile-widgets 2016-04-04 22:33:58 -07:00
statistics.c Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
statistics.h Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
strndup.h Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
strtod.c Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
subsurfacestartup.c Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
subsurfacestartup.h Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
subsurfacesysinfo.cpp Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
subsurfacesysinfo.h Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
taxonomy.c Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
taxonomy.h Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
time.c Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
uemis-downloader.c Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
uemis.c Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
uemis.h Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
units.h Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
version.c Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
version.h Move subsurface-core to core and qt-mobile to mobile-widgets 2016-04-04 22:33:58 -07:00
webservice.h Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
windows.c Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
windowtitleupdate.cpp Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
windowtitleupdate.h Add SPDX header to remaining core files 2017-04-29 13:32:55 -07:00
worldmap-options.h Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
worldmap-save.c Add SPDX header to core C files 2017-04-29 13:32:55 -07:00
worldmap-save.h Add SPDX header to core C files 2017-04-29 13:32:55 -07:00