valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

cleaned up shutdown sequence. Added SDL_Quit

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@1684
This commit is contained in:
Peter Veenstra 2004-02-19 12:24:51 +00:00
parent bd02cf869e
commit f8a42011ea
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/gui/sdlmain.cpp
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: sdlmain.cpp,v 1.61 2004-02-10 16:35:02 qbix79 Exp $ */
/* $Id: sdlmain.cpp,v 1.62 2004-02-19 12:24:51 qbix79 Exp $ */
#ifndef _GNU_SOURCE
#define _GNU_SOURCE
@ -526,6 +526,7 @@ static void GUI_ShutDown(Section * sec) {
GFX_Stop();
if (sdl.mouse.locked) CaptureMouse();
if (sdl.desktop.fullscreen) SwitchFullScreen();
SDL_Quit(); //Becareful this should be removed if on the fly renderchanges are allowed
}
static void KillSwitch(void){
@ -995,8 +996,6 @@ int main(int argc, char* argv[]) {
control->StartUp();
/* Shutdown everything */
} catch (char * error) {
if (sdl.desktop.fullscreen) SwitchFullScreen();
if (sdl.mouse.locked) CaptureMouse();
LOG_MSG("Exit to error: %s",error);
if(sdl.wait_on_error) {
//TODO Maybe look for some way to show message in linux?
@ -1010,8 +1009,11 @@ int main(int argc, char* argv[]) {
}
catch (int){
if (sdl.desktop.fullscreen) SwitchFullScreen();
if (sdl.mouse.locked) CaptureMouse();
;//nothing pressed killswitch
}
catch(...){
throw;//dunno what happened. rethrow for sdl to catch
}
return 0;
};