From 738107bb7098ccff3b8dd2e21d9acdb724c39101 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 3 Dec 2002 00:33:34 +0000 Subject: [PATCH] Don't reinit the SDL; it causes problems with the error handler. --- stepmania/src/RageNetworkClient.cpp | 4 +++- stepmania/src/RageNetworkServer.cpp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/stepmania/src/RageNetworkClient.cpp b/stepmania/src/RageNetworkClient.cpp index a58b846a12..26f0f11142 100644 --- a/stepmania/src/RageNetworkClient.cpp +++ b/stepmania/src/RageNetworkClient.cpp @@ -45,7 +45,9 @@ RageNetworkClient::RageNetworkClient() m_priSock = 0; m_priSockSet = NULL; - SDL_Init(0); // this may have already been init'd somewhere else + /* Don't do this; it'll fire up things we might not want. Let StepMania.cpp + * do the initial SDL config. */ + // SDL_Init(0); // this may have already been init'd somewhere else if( SDLNet_Init() < 0 ) throw RageException("SDLNet_Init: %s\n", SDLNet_GetError()); diff --git a/stepmania/src/RageNetworkServer.cpp b/stepmania/src/RageNetworkServer.cpp index f3916ed072..70f8c3e515 100644 --- a/stepmania/src/RageNetworkServer.cpp +++ b/stepmania/src/RageNetworkServer.cpp @@ -59,7 +59,9 @@ RageNetworkServer::RageNetworkServer() m_listenSockSet = NULL; m_clientSocksSet = NULL; - SDL_Init(0); // this may have already been init'd somewhere else + /* Don't do this; it'll fire up things we might not want. Let StepMania.cpp + * do the initial SDL config. */ + // SDL_Init(0); // this may have already been init'd somewhere else if( SDLNet_Init() < 0 ) throw RageException("SDLNet_Init: %s\n", SDLNet_GetError());