From 9a7defdd069d9e96752af98828974795616c7158 Mon Sep 17 00:00:00 2001 From: Seulgi Kim Date: Sun, 14 Apr 2019 18:48:16 -0700 Subject: [PATCH] Rename variables and add comments around why checking if units alredy have values. --- src/CalcManager/UnitConverter.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/CalcManager/UnitConverter.cpp b/src/CalcManager/UnitConverter.cpp index 733b475c..b1df3bfb 100644 --- a/src/CalcManager/UnitConverter.cpp +++ b/src/CalcManager/UnitConverter.cpp @@ -922,10 +922,12 @@ void UnitConverter::InitializeSelectedUnits() vector curUnits = itr->second; if (!curUnits.empty()) { - bool isFromRestored = find(curUnits.begin(), curUnits.end(), m_fromType) != curUnits.end(); - bool isToRestored = find(curUnits.begin(), curUnits.end(), m_toType) != curUnits.end(); + // Units may already have been initialized through UnitConverter::RestoreUserPreferences(). + // Check if they have been, and if so, do not override restored units. + bool isFromUnitValid = find(curUnits.begin(), curUnits.end(), m_fromType) != curUnits.end(); + bool isToUnitValid = find(curUnits.begin(), curUnits.end(), m_toType) != curUnits.end(); - if (isFromRestored && isToRestored) + if (isFromUnitValid && isToUnitValid) { return; } @@ -934,13 +936,13 @@ void UnitConverter::InitializeSelectedUnits() bool conversionTargetSet = false; for (const Unit& cur : curUnits) { - if (!conversionSourceSet && cur.isConversionSource && !isFromRestored) + if (!conversionSourceSet && cur.isConversionSource && !isFromUnitValid) { m_fromType = cur; conversionSourceSet = true; } - if (!conversionTargetSet && cur.isConversionTarget && !isToRestored) + if (!conversionTargetSet && cur.isConversionTarget && !isToUnitValid) { m_toType = cur; conversionTargetSet = true;