From 0d49b3c0f8d1004b1b0e4d6df298b5b639da0fad Mon Sep 17 00:00:00 2001
From: theoddone33 <>
Date: Wed, 18 Apr 2001 02:00:32 +0000
Subject: [PATCH] Fix improper exiting

---
 zsnes/src/linux/sdllink.c    | 6 +++++-
 zsnes/src/linux/winintrf.asm | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/zsnes/src/linux/sdllink.c b/zsnes/src/linux/sdllink.c
index a8306fdc..90e21a84 100644
--- a/zsnes/src/linux/sdllink.c
+++ b/zsnes/src/linux/sdllink.c
@@ -214,6 +214,7 @@ void ExitFunction(void)
 #ifdef __LINUX__ // AH
 int shiftptr = 0;
 void ProcessKeyBuf(int scancode);
+void LinuxExit(void);
 
 int Main_Proc(void)
 {
@@ -298,6 +299,9 @@ int Main_Proc(void)
 		case SDL_JOYBUTTONUP: 
 			pressed[0x100 + CurrentJoy*32 + 16 + JoyButton] = 0; 
 			break;    			
+		case SDL_QUIT:
+			LinuxExit();
+			break;
 		default: break;
 	   }
    }
@@ -2445,7 +2449,7 @@ void drawscreenwin(void)
 
 void LinuxExit (void)
 {
-	SDL_Quit();
+	if (sdl_inited) SDL_Quit();
 	exit(0);
 }
 
diff --git a/zsnes/src/linux/winintrf.asm b/zsnes/src/linux/winintrf.asm
index 2652a674..eb1aa540 100644
--- a/zsnes/src/linux/winintrf.asm
+++ b/zsnes/src/linux/winintrf.asm
@@ -341,7 +341,6 @@ NEWSYM WaitForKey       ; Wait for a key to be pressed
 
 NEWSYM OsExit
 NEWSYM OSExit
-    call exit
     ;int 3h
     jmp DosExit