diff options
author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-01-26 20:10:12 +0100 |
---|---|---|
committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2010-01-26 22:34:10 +0100 |
commit | fed093879282fac03c4fdcaa0aac519de468f1e1 (patch) | |
tree | 1043129fb0c1e21b626c1e7809b44c43f6837d7b /src/graphics.h | |
parent | 7ada762ca81045cfe8b2556ae9e7b8b4749d84f8 (diff) | |
download | mana-fed093879282fac03c4fdcaa0aac519de468f1e1.tar.gz mana-fed093879282fac03c4fdcaa0aac519de468f1e1.tar.bz2 mana-fed093879282fac03c4fdcaa0aac519de468f1e1.tar.xz mana-fed093879282fac03c4fdcaa0aac519de468f1e1.zip |
Fixed crash when failing to switch to fullscreen/windowed
The setup page tries to restore the previous video mode by calling
setFullscreen again after it has failed. However, the setFullscreen
function assumed a valid mode was set (it referenced mScreen). This
would then crash.
Worked around by remembering the parameters passed to setVideoMode, and
using those in setFullscreen.
Besides fixing a potential crash, this also fixes switching between
fullscreen and windowed on Maemo 5. Probably trying to keep the color
depth the same was what made it fail (which is not necessary anyway).
Diffstat (limited to 'src/graphics.h')
-rw-r--r-- | src/graphics.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/graphics.h b/src/graphics.h index b8e87af1..b9b2b1d5 100644 --- a/src/graphics.h +++ b/src/graphics.h @@ -195,7 +195,11 @@ class Graphics : public gcn::SDLGraphics protected: SDL_Surface *mScreen; - bool mFullscreen, mHWAccel; + int mWidth; + int mHeight; + int mBpp; + bool mFullscreen; + bool mHWAccel; }; extern Graphics *graphics; |