Skip to content

Commit 85d1f2d

Browse files
authored
Merge pull request #3251 from softins/missing-braces
2 parents 6f28c7c + 8c9eb5c commit 85d1f2d

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

src/settings.cpp

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -875,6 +875,7 @@ void CServerSettings::ReadSettingsFromXML ( const QDomDocument& IniXMLDocument,
875875
directoryType = bValue ? AT_DEFAULT : AT_CUSTOM;
876876
}
877877
else
878+
{
878879
//### TODO: END ###//
879880

880881
// if "directorytype" itself is set, use it (note "AT_NONE", "AT_DEFAULT" and "AT_CUSTOM" are min/max directory type here)
@@ -892,15 +893,19 @@ void CServerSettings::ReadSettingsFromXML ( const QDomDocument& IniXMLDocument,
892893
}
893894
//### TODO: END ###//
894895

895-
else if ( GetNumericIniSet ( IniXMLDocument,
896-
"server",
897-
"directorytype",
898-
static_cast<int> ( AT_NONE ),
899-
static_cast<int> ( AT_CUSTOM ),
900-
iValue ) )
896+
else
901897
{
902-
directoryType = static_cast<EDirectoryType> ( iValue );
898+
if ( GetNumericIniSet ( IniXMLDocument,
899+
"server",
900+
"directorytype",
901+
static_cast<int> ( AT_NONE ),
902+
static_cast<int> ( AT_CUSTOM ),
903+
iValue ) )
904+
{
905+
directoryType = static_cast<EDirectoryType> ( iValue );
906+
}
903907
}
908+
}
904909

905910
//### TODO: BEGIN ###//
906911
// compatibility to old version < 3.9.0

0 commit comments

Comments
 (0)