From b6c674abd87a4d6a4b32e6d43e4d481adb6e17a2 Mon Sep 17 00:00:00 2001
From: pagefault <>
Date: Wed, 1 Aug 2001 00:16:11 +0000
Subject: [PATCH] MMX options save fix

---
 zsnes/src/cfgload.asm | 2 +-
 zsnes/src/ui.asm      | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/zsnes/src/cfgload.asm b/zsnes/src/cfgload.asm
index cb1c0873..116d46e4 100644
--- a/zsnes/src/cfgload.asm
+++ b/zsnes/src/cfgload.asm
@@ -1797,7 +1797,7 @@ NEWSYM getcfg
     cmp byte[.stringb],'1'
     jne .nofpu
     mov byte[FPUCopy],0
-    mov byte[cfgcopymethod],1
+    mov byte[cfgcopymethod],0
     jmp .nocopymethod
 .nofpu
     cmp byte[.stringb],'2'
diff --git a/zsnes/src/ui.asm b/zsnes/src/ui.asm
index 35eac081..f3415851 100644
--- a/zsnes/src/ui.asm
+++ b/zsnes/src/ui.asm
@@ -33,7 +33,7 @@ EXTSYM smallscreenon,spcon
 EXTSYM statefileloc,LatestSave
 EXTSYM Create_File,Delete_File,Open_File,Get_File_Date,Close_File,Change_Dir,Get_Dir
 EXTSYM romloadskip
-EXTSYM cfgloadgdir,cfgloadsdir
+EXTSYM cfgloadgdir,cfgloadsdir,cfgcopymethod
 EXTSYM init18_2hz
 EXTSYM OSExit
 %ifdef __LINUX__
@@ -1569,7 +1569,7 @@ NEWSYM DosExit ; Terminate Program
 NEWSYM MMXCheck
     ; Check for cpu that doesn't support CPUID
     cmp byte[FPUCopy],3
-    jne .nommx2
+    jne near .nommx2
     mov edx,cpuidfname
     call Open_File
     jc .skipcheck
@@ -1589,6 +1589,7 @@ NEWSYM MMXCheck
 
     ; MMX support
     mov byte[FPUCopy],0
+    mov byte[cfgcopymethod],0
     mov eax,1
     CPUID
 
@@ -1600,6 +1601,7 @@ NEWSYM MMXCheck
     test edx,1 << 23
     jz .nommx
     mov byte[FPUCopy],2
+    mov byte[cfgcopymethod],2
     mov edx,YesMMX
     call PrintStr
 .nommx