diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-15 14:48:31 -1000 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-06-16 21:17:35 -0700 |
| commit | 6fd1e32452a9d3d1fb7116764442bbd26d36673e (patch) | |
| tree | ae49e83505a54597050147ecab9b8e871b024a36 /qt-ui/downloadfromdivecomputer.cpp | |
| parent | c917b29701470398b51aa5ad9541275825d912fd (diff) | |
| download | subsurface-6fd1e32452a9d3d1fb7116764442bbd26d36673e.tar.gz | |
Properly initialize device_data_t when downloading
The old gtk branch started out with device_data_t explicitly cleared,
but the Qt version never did that. And we actually depend on the
deviceid in particular being initialized to zero (and then we fill in
the details in the divecomputer download callbacks)
Not properly initializing it meant that we ended up with random
deviceid's that got added to the divecomputer device lists, and then
saved to the XML file without actually matching the data in the dive
computers in the actual *dives*.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/downloadfromdivecomputer.cpp')
| -rw-r--r-- | qt-ui/downloadfromdivecomputer.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qt-ui/downloadfromdivecomputer.cpp b/qt-ui/downloadfromdivecomputer.cpp index b0bdea739..37ca2775b 100644 --- a/qt-ui/downloadfromdivecomputer.cpp +++ b/qt-ui/downloadfromdivecomputer.cpp @@ -157,6 +157,7 @@ void DownloadFromDCWidget::on_ok_clicked() data.product = strdup(ui->product->currentText().toUtf8().data()); data.descriptor = descriptorLookup[ui->vendor->currentText() + ui->product->currentText()]; data.force_download = ui->forceDownload->isChecked(); + data.deviceid = data.diveid = 0; set_default_dive_computer(data.vendor, data.product); set_default_dive_computer_device(data.devname); |