diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-02 13:03:05 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-02 13:03:05 +0300 |
| commit | ee8191705826d978b7793497fdd307536c709bff (patch) | |
| tree | 6cfbfc9d72bf636d2da373b4d023705207db4685 /src/graphicsmanager.cpp | |
| parent | fb5d0e7762f692948dddebd3deb38a0bd20de5f2 (diff) | |
| parent | 0c4ed5a9594b849b436fca13c6992dee923915ed (diff) | |
| download | plus-ee8191705826d978b7793497fdd307536c709bff.tar.gz plus-ee8191705826d978b7793497fdd307536c709bff.tar.bz2 plus-ee8191705826d978b7793497fdd307536c709bff.tar.xz plus-ee8191705826d978b7793497fdd307536c709bff.zip | |
Merge branch 'temp1' into stable
Diffstat (limited to 'src/graphicsmanager.cpp')
| -rw-r--r-- | src/graphicsmanager.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp index 552f5a018..00cceb22f 100644 --- a/src/graphicsmanager.cpp +++ b/src/graphicsmanager.cpp @@ -376,9 +376,10 @@ void GraphicsManager::setVideoMode() int width = config.getIntValue("screenwidth"); int height = config.getIntValue("screenheight"); #endif + const int scale = config.getIntValue("scale"); // Try to set the desired video mode - if (!mainGraphics->setVideoMode(width, height, bpp, + if (!mainGraphics->setVideoMode(width, height, scale, bpp, fullscreen, hwaccel, enableResize, noFrame)) { logger->log(strprintf("Couldn't set %dx%dx%d video mode: %s", @@ -396,7 +397,7 @@ void GraphicsManager::setVideoMode() config.setValueInt("screenwidth", oldWidth); config.setValueInt("screenheight", oldHeight); config.setValue("screen", oldFullscreen == 1); - if (!mainGraphics->setVideoMode(oldWidth, oldHeight, bpp, + if (!mainGraphics->setVideoMode(oldWidth, oldHeight, scale, bpp, oldFullscreen, hwaccel, enableResize, noFrame)) { logger->safeError(strprintf("Couldn't restore %dx%dx%d " |