Merge with develop

This commit is contained in:
Nimetu 2016-07-07 01:01:00 +03:00
parent 391706c1d8
commit 2ce1a63026

View file

@ -3450,20 +3450,8 @@ class CHandlerGameConfigApply : public IActionHandler
{ {
uint32 width, height; uint32 width, height;
Driver->getWindowSize(width, height); Driver->getWindowSize(width, height);
w = width;
// window is too large h = height;
if (width >= screenMode.Width || height >= screenMode.Height)
{
// choose a smaller size
w = 1024;
h = 768;
}
else
{
// take previous mode
w = width;
h = height;
}
} }
ClientCfg.Width = w; ClientCfg.Width = w;