Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: Crash when displaying configuration window

Browse source
This commit is contained in:
kervala 2015-11-01 16:46:47 +01:00
parent e436b954d0
commit af0f35ff6c
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
code/ryzom/client/src/init.cpp
View file

@ -953,7 +953,7 @@ void prelogInit()
return; return;
} }
if (ClientCfg.Width <= 0 || ClientCfg.Height <= 0) if (ClientCfg.Width < 800 || ClientCfg.Height < 600)
{ {
UDriver::CMode mode; UDriver::CMode mode;
@ -967,6 +967,15 @@ void prelogInit()
ClientCfg.Width = 1024; ClientCfg.Width = 1024;
ClientCfg.Height = 768; ClientCfg.Height = 768;
} }
// update client.cfg with detected resolution
CConfigFile::CVar *varPtr = ClientCfg.ConfigFile.getVarPtr("Width");
if(varPtr)
varPtr->forceAsInt(ClientCfg.Width);
varPtr = ClientCfg.ConfigFile.getVarPtr("Height");
if(varPtr)
varPtr->forceAsInt(ClientCfg.Height);
} }
CLoginProgressPostThread::getInstance().step(CLoginStep(LoginStep_VideoModeSetup, "login_step_video_mode_setup")); CLoginProgressPostThread::getInstance().step(CLoginStep(LoginStep_VideoModeSetup, "login_step_video_mode_setup"));