GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix code style

Browse Source 
(cherry picked from commit 16cd75d179)
This commit is contained in:
Wojtek Figat
2020-12-22 12:57:00 +01:00
parent 70d0c0ea8a
commit 5e239f5d87
10 changed files with 17 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Engine/Core/Config/GameSettings.cpp
View File

@@ -78,13 +78,10 @@ bool GameSettings::Load()
if (id.IsValid()) \
{ \
AssetReference<JsonAsset> subAsset = Content::LoadAsync<JsonAsset>(id); \
if (subAsset) \
if (subAsset && !subAsset->WaitForLoaded()) \
{ \
if (!subAsset->WaitForLoaded()) \
{ \
settingsType::Instance()->Deserialize(*subAsset->Data, nullptr); \
settingsType::Instance()->Apply(); \
} \
settingsType::Instance()->Deserialize(*subAsset->Data, nullptr); \
settingsType::Instance()->Apply(); \
} \
else \
{ LOG(Warning, "Cannot load " nodeName " settings"); } \
@@ -143,7 +140,6 @@ bool GameSettings::Load()
LOAD_SETTINGS("Navigation", NavigationSettings);
// Load platform settings
// TODO: refactor platform settings impl to be more modular (better multi-platform handling)
#if PLATFORM_WINDOWS
LOAD_SETTINGS("WindowsPlatform", WindowsPlatformSettings);
#endif