fix SDL_VIDEODRIVER not being set for SDL loading windows
This commit is contained in:
@@ -263,6 +263,24 @@ void SetupSDL()
|
|||||||
/* Attempt to shut down the window on crash. */
|
/* Attempt to shut down the window on crash. */
|
||||||
RegisterEmergencyShutdownCallback( EmergencyShutdownSDL );
|
RegisterEmergencyShutdownCallback( EmergencyShutdownSDL );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(LINUX)
|
||||||
|
static bool bSetVideoDriver = false;
|
||||||
|
if( !bSetVideoDriver )
|
||||||
|
{
|
||||||
|
bSetVideoDriver = true;
|
||||||
|
|
||||||
|
/* Most people don't have this set. SDL has a habit of trying to
|
||||||
|
* fall back on other drivers (svgalib, aalib), so set it to "x11". */
|
||||||
|
const char *sVideoDriver = getenv("SDL_VIDEODRIVER");
|
||||||
|
if( sVideoDriver == NULL || sVideoDriver[0] == 0 )
|
||||||
|
{
|
||||||
|
static char env[] = "SDL_VIDEODRIVER=x11";
|
||||||
|
putenv( env );
|
||||||
|
} else if( strcmp( sVideoDriver, "x11" ) )
|
||||||
|
LOG->Info( "SDL_VIDEODRIVER has been set to %s", sVideoDriver );
|
||||||
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -72,24 +72,6 @@ CString LowLevelWindow_SDL::TryVideoMode( RageDisplay::VideoModeParams p, bool &
|
|||||||
|
|
||||||
SDL_QuitSubSystem(SDL_INIT_VIDEO);
|
SDL_QuitSubSystem(SDL_INIT_VIDEO);
|
||||||
|
|
||||||
#if defined(LINUX)
|
|
||||||
static bool bSetVideoDriver = false;
|
|
||||||
if( !bSetVideoDriver )
|
|
||||||
{
|
|
||||||
bSetVideoDriver = true;
|
|
||||||
|
|
||||||
/* Most people don't have this set. SDL has a habit of trying to
|
|
||||||
* fall back on other drivers (svgalib, aalib), so set it to "x11". */
|
|
||||||
const char *sVideoDriver = getenv("SDL_VIDEODRIVER");
|
|
||||||
if( sVideoDriver == NULL )
|
|
||||||
{
|
|
||||||
static char env[] = "SDL_VIDEODRIVER=x11";
|
|
||||||
putenv( env );
|
|
||||||
} else if( strcmp( sVideoDriver, "x11" ) )
|
|
||||||
LOG->Info( "SDL_VIDEODRIVER has been set to %s", sVideoDriver );
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if( SDL_InitSubSystem(SDL_INIT_VIDEO) == -1 )
|
if( SDL_InitSubSystem(SDL_INIT_VIDEO) == -1 )
|
||||||
{
|
{
|
||||||
const CString err = mySDL_GetError();
|
const CString err = mySDL_GetError();
|
||||||
|
|||||||
Reference in New Issue
Block a user