From 9b3b12c3bec74c4a8a506db758f4bc81aa54e7dd Mon Sep 17 00:00:00 2001
From: pagefault <>
Date: Tue, 30 Oct 2001 22:08:26 +0000
Subject: [PATCH] Fixed sound option saving

---
 zsnes/src/gui/gui.asm        | 4 ++++
 zsnes/src/linux/sdlintrf.asm | 2 --
 zsnes/src/ui.asm             | 3 ---
 zsnes/src/win/winintrf.asm   | 2 --
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/zsnes/src/gui/gui.asm b/zsnes/src/gui/gui.asm
index ccec83d8..d1deb868 100644
--- a/zsnes/src/gui/gui.asm
+++ b/zsnes/src/gui/gui.asm
@@ -2162,6 +2162,10 @@ NEWSYM StartGUI
     jne .nofirsttime
     call guifirsttimemsg
     mov byte[FirstTimeData],1
+%ifndef __MSDOS__
+    mov byte[soundon],1
+    mov byte[cfgsoundon],1
+%endif
 .nofirsttime
     cmp dword[GUICTimer],0
     je .notimer
diff --git a/zsnes/src/linux/sdlintrf.asm b/zsnes/src/linux/sdlintrf.asm
index 91766f4b..0eecb65d 100644
--- a/zsnes/src/linux/sdlintrf.asm
+++ b/zsnes/src/linux/sdlintrf.asm
@@ -200,8 +200,6 @@ NEWSYM SystemInit
 %endif
 
     mov byte[spcon],1
-    mov byte[soundon],1
-    mov byte[cfgsoundon],1
 
     ; Get and set the initial directory
 %ifdef __LINUX__
diff --git a/zsnes/src/ui.asm b/zsnes/src/ui.asm
index 1c4adce5..0d376600 100644
--- a/zsnes/src/ui.asm
+++ b/zsnes/src/ui.asm
@@ -92,9 +92,6 @@ NEWSYM zstart
 
 	call setnoise
 	call InitSPC
-        %ifndef __MSDOS__
-        mov byte[soundon],1
-        %endif
 	call allocmem           ;allocate memory
 
 	cmp byte[soundon],0
diff --git a/zsnes/src/win/winintrf.asm b/zsnes/src/win/winintrf.asm
index 4d0b3a86..4873e554 100644
--- a/zsnes/src/win/winintrf.asm
+++ b/zsnes/src/win/winintrf.asm
@@ -191,8 +191,6 @@ NEWSYM SystemInit
     mov byte[esi+12+256],0
 
     mov byte[spcon],1
-    mov byte[soundon],1
-    mov byte[cfgsoundon],1
 
     ; Get and set the initial directory
     mov ebx,InitDir