Merge pull request #204 from mjbudd77/master
Bug fix for Qt GUI full screen command line switch.
This commit is contained in:
commit
4a5aafd638
|
@ -46,6 +46,17 @@ consoleWin_t::consoleWin_t(QWidget *parent)
|
||||||
: QMainWindow( parent )
|
: QMainWindow( parent )
|
||||||
{
|
{
|
||||||
int use_SDL_video = false;
|
int use_SDL_video = false;
|
||||||
|
int setFullScreen = false;
|
||||||
|
|
||||||
|
this->resize( 512, 512 );
|
||||||
|
|
||||||
|
g_config->getOption( "SDL.Fullscreen", &setFullScreen );
|
||||||
|
g_config->setOption( "SDL.Fullscreen", 0 ); // Reset full screen config parameter to false so it is never saved this way
|
||||||
|
|
||||||
|
if ( setFullScreen )
|
||||||
|
{
|
||||||
|
this->showFullScreen();
|
||||||
|
}
|
||||||
|
|
||||||
createMainMenu();
|
createMainMenu();
|
||||||
|
|
||||||
|
|
|
@ -64,7 +64,6 @@ int main( int argc, char *argv[] )
|
||||||
|
|
||||||
consoleWindow = new consoleWin_t();
|
consoleWindow = new consoleWin_t();
|
||||||
|
|
||||||
consoleWindow->resize( 512, 512 );
|
|
||||||
consoleWindow->show();
|
consoleWindow->show();
|
||||||
|
|
||||||
if ( consoleWindow->viewport_SDL )
|
if ( consoleWindow->viewport_SDL )
|
||||||
|
|
Loading…
Reference in New Issue