mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-07-03 01:34:22 +00:00
Merge branch 'dev' into refactor/untangle-assets-mess
This commit is contained in:
@@ -630,7 +630,11 @@ void CMinecraftApp::InitGameSettings()
|
||||
C4JStorage::PROFILESETTINGS *pProfileSettings=StorageManager.GetDashboardProfileSettings(i);
|
||||
// 4J-PB - don't cause an options write to happen here
|
||||
SetDefaultOptions(pProfileSettings,i,false);
|
||||
|
||||
#else
|
||||
// Linux (and any other platform): profile data is zero-initialised, so explicitly apply defaults
|
||||
C_4JProfile::PROFILESETTINGS *pProfileSettings=ProfileManager.GetDashboardProfileSettings(i);
|
||||
memset(pProfileSettings,0,sizeof(C_4JProfile::PROFILESETTINGS));
|
||||
SetDefaultOptions(pProfileSettings,i);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user