Merge with develop

--HG-- branch : compatibility-develop
2016-07-07 01:01:00 +03:00 · 2016-07-07 01:01:00 +03:00 · ec616deeb8
commit ec616deeb8
parent f4bb446439 8f1da052a2
1 changed files with 2 additions and 14 deletions
--- a/code/ryzom/client/src/interface_v3/action_handler_game.cpp
+++ b/code/ryzom/client/src/interface_v3/action_handler_game.cpp
@ -3450,21 +3450,9 @@ class CHandlerGameConfigApply : public IActionHandler
 				{
 					uint32 width, height;
 					Driver->getWindowSize(width, height);
-
-					// window is too large
-					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.Height = h;