mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-12-20 16:08:44 +00:00
Merged in nimetu/ryzomcore (pull request #28)
Fixed: restore correct resolution
This commit is contained in:
commit
349b8a8b55
2 changed files with 6 additions and 3 deletions
|
@ -1943,16 +1943,21 @@ class CAHInitResLod : public IActionHandler
|
|||
|
||||
VideoModes.clear();
|
||||
StringModeList.clear();
|
||||
StringModeList.push_back("uiConfigWindowed");
|
||||
|
||||
CurrentMode = getRyzomModes(VideoModes, StringModeList);
|
||||
|
||||
// getRyzomModes() expects empty list, so we need to insert 'Windowed' after mode list is filled
|
||||
StringModeList.insert(StringModeList.begin(), "uiConfigWindowed");
|
||||
|
||||
// If the client is in windowed mode, still in windowed mode and do not change anything
|
||||
if (ClientCfg.Windowed)
|
||||
CurrentMode = 0;
|
||||
// If we have not found the mode so it can be an error or machine change, so propose the first available
|
||||
else if (CurrentMode == -1)
|
||||
CurrentMode = 1;
|
||||
// We inserted 'Windowed' as first mode, so index needs to move too
|
||||
else
|
||||
++CurrentMode;
|
||||
|
||||
CInterfaceManager *pIM = CInterfaceManager::getInstance();
|
||||
CViewText *pVT = dynamic_cast<CViewText*>(CWidgetManager::getInstance()->getElementFromId("ui:login:checkpass:content:res_value"));
|
||||
|
|
|
@ -468,8 +468,6 @@ void releaseOutGame()
|
|||
// flush the server string cache
|
||||
STRING_MANAGER::CStringManagerClient::instance()->flushStringCache();
|
||||
|
||||
ClientCfg.release ();
|
||||
|
||||
// Disconnect the client from the server.
|
||||
NetMngr.disconnect();
|
||||
|
||||
|
|
Loading…
Reference in a new issue