mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-11 03:21:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

desktop UI: use salinity of current DC, not first DC

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-01-05 11:13:14 -08:00
parent eac87f6481
commit c03731b220
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
desktop-widgets/tab-widgets/TabDiveInformation.cpp
View file

@ -197,7 +197,7 @@ void TabDiveInformation::checkDcSalinityOverWritten()
{ {
if (!current_dive) if (!current_dive)
return; return;
int dc_value = current_dive->dc.salinity; int dc_value = current_dc->salinity;
int user_value = current_dive->user_salinity; int user_value = current_dive->user_salinity;
bool show_indicator = false; bool show_indicator = false;
if (user_value != dc_value) if (user_value != dc_value)
@ -272,7 +272,7 @@ void TabDiveInformation::updateData()
void TabDiveInformation::on_waterTypeCombo_activated(int index) { void TabDiveInformation::on_waterTypeCombo_activated(int index) {
Q_UNUSED(index) Q_UNUSED(index)
int combobox_salinity = 0; int combobox_salinity = 0;
int dc_salinity = current_dive->dc.salinity; int dc_salinity = current_dc->salinity;
switch(ui->waterTypeCombo->currentIndex()) { switch(ui->waterTypeCombo->currentIndex()) {
case FRESHWATER: case FRESHWATER:
combobox_salinity = FRESHWATER_SALINITY; combobox_salinity = FRESHWATER_SALINITY;