diff --git a/stepmania/src/RageDisplay.cpp b/stepmania/src/RageDisplay.cpp index eb2616c1da..d760566a23 100644 --- a/stepmania/src/RageDisplay.cpp +++ b/stepmania/src/RageDisplay.cpp @@ -59,9 +59,6 @@ RString RageDisplay::SetVideoMode( VideoModeParams p, bool &bNeedReloadTextures LOG->Trace( "TryVideoMode failed: %s", err.c_str() ); // fall back -#if !defined(_XBOX) - p.windowed = true; -#endif if( this->TryVideoMode(p,bNeedReloadTextures) == "" ) return RString(); p.bpp = 16; diff --git a/stepmania/src/RageDisplay_D3D.cpp b/stepmania/src/RageDisplay_D3D.cpp index a94e4c71c6..2bc9a62c53 100644 --- a/stepmania/src/RageDisplay_D3D.cpp +++ b/stepmania/src/RageDisplay_D3D.cpp @@ -552,15 +552,15 @@ static void SetPresentParametersFromVideoModeParams( const VideoModeParams &p, D RString RageDisplay_D3D::TryVideoMode( const VideoModeParams &_p, bool &bNewDeviceOut ) { VideoModeParams p = _p; - - //LOG->Warn( "RageDisplay_D3D::TryVideoMode( %d, %d, %d, %d, %d, %d )", p.windowed, p.width, p.height, p.bpp, p.rate, p.vsync ); +#if defined(XBOX) + p.windowed = false; +#endif + LOG->Warn( "RageDisplay_D3D::TryVideoMode( %d, %d, %d, %d, %d, %d )", p.windowed, p.width, p.height, p.bpp, p.rate, p.vsync ); if( FindBackBufferType( p.windowed, p.bpp ) == D3DFMT_UNKNOWN ) // no possible back buffer formats return ssprintf( "FindBackBufferType(%i,%i) failed", p.windowed, p.bpp ); // failed to set mode -#if defined(XBOX) - p.windowed = false; -#endif + /* Set up and display the window before setting up D3D. If we don't do this, * then setting up a fullscreen window (when we're not coming from windowed)