github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-22 14:13:30 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add precheck

Browse source
This commit is contained in:
Seulgi Kim 2019-04-14 18:52:30 -07:00
commit 1e5f5ec701
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/CalcManager/UnitConverter.cpp
View file

@ -924,8 +924,8 @@ void UnitConverter::InitializeSelectedUnits()
{ {
// Units may already have been initialized through UnitConverter::RestoreUserPreferences(). // Units may already have been initialized through UnitConverter::RestoreUserPreferences().
// Check if they have been, and if so, do not override restored units. // 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 isFromUnitValid = m_fromType != EMPTY_UNIT && find(curUnits.begin(), curUnits.end(), m_fromType) != curUnits.end();
bool isToUnitValid = find(curUnits.begin(), curUnits.end(), m_toType) != curUnits.end(); bool isToUnitValid = m_toType != EMPTY_UNIT && find(curUnits.begin(), curUnits.end(), m_toType) != curUnits.end();
if (isFromUnitValid && isToUnitValid) if (isFromUnitValid && isToUnitValid)
{ {