Skip to content

Commit 71ed5dc

Browse files
authored
Always check for deprecated config keys
1 parent c763128 commit 71ed5dc

1 file changed

Lines changed: 12 additions & 6 deletions

File tree

src/parameter.cpp

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ SK_LazyGlobal <sk::ParameterFactory> g_ParameterFactory;
2929
bool
3030
sk::iParameter::load (void)
3131
{
32+
bool bRet = false;
33+
3234
const iSK_INISection* section =
3335
( ini == nullptr ) ? nullptr
3436
: ini->contains_section (ini_section);
@@ -43,12 +45,15 @@ sk::iParameter::load (void)
4345
{
4446
set_value_str (*key);
4547

46-
return true;
48+
bRet = true;
4749
}
4850

4951
static const std::unordered_map <std::wstring, std::unordered_map <std::wstring, std::wstring>> ini_keys_old =
5052
{
51-
{ L"Render.FrameRate", { { L"BufferCount", L"BackBufferCount" } } }
53+
{ L"Render.FrameRate", {
54+
{ L"BufferCount", L"BackBufferCount" }
55+
}
56+
}
5257
};
5358

5459
if (ini_keys_old.contains (ini_section) && ini_keys_old.at (ini_section).contains (ini_key))
@@ -61,16 +66,17 @@ sk::iParameter::load (void)
6166
if ( key_old != nullptr &&
6267
(! key_old->empty ()) )
6368
{
64-
set_value_str (*key_old);
69+
if (! std::exchange (bRet, true))
70+
{
71+
set_value_str (*key_old);
72+
}
6573

6674
ini->get_section (ini_section).remove_key (ini_key_old);
67-
68-
return true;
6975
}
7076
}
7177
}
7278

73-
return false;
79+
return bRet;
7480
}
7581

7682
bool

0 commit comments

Comments
 (0)