a_dinosaur/ZSNES
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed GUI crash when using reset with certain windows open

Browse Source
This commit is contained in:
pagefault
2002-02-20 22:36:52 +00:00
parent 330e922b21
commit b9518c534b
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
zsnes/src/gui/gui.asm
View File

@@ -723,7 +723,8 @@ NEWSYM IPXInfoStrR, dw 0
NEWSYM GUICMessage, dd 0 NEWSYM GUICMessage, dd 0
NEWSYM GUICTimer, dd 0 NEWSYM GUICTimer, dd 0
NEWSYM GUIOn, db 0 NEWSYM GUIOn, db 0
NEWSYM GUIOn2, db 0 NEWSYM GUIOn2, db 0
NEWSYM GUIReset, db 0
;GOSPort db 0 ;GOSPort db 0
NEWSYM CurPalSelect, db 0 NEWSYM CurPalSelect, db 0
@@ -2487,6 +2488,7 @@ NEWSYM StartGUI
call AdjustFrequency call AdjustFrequency
mov byte[GUIOn],0 mov byte[GUIOn],0
mov byte[GUIOn2],0 mov byte[GUIOn2],0
mov byte[GUIReset],0
mov dword[StartLL],0 mov dword[StartLL],0
mov dword[StartLR],0 mov dword[StartLR],0
mov byte[NetLoadState],0 mov byte[NetLoadState],0
@@ -3422,6 +3424,8 @@ DisplayBoxes:
push esi push esi
cmp al,1 cmp al,1
jne .noguiconfirm jne .noguiconfirm
cmp byte[GUIReset],1
je near .finstuff
call DisplayGUILoad call DisplayGUILoad
jmp .finstuff jmp .finstuff
.noguiconfirm .noguiconfirm
@@ -3601,6 +3605,7 @@ LoadSecondState:
GUIProcReset: GUIProcReset:
cmp byte[GUICBHold],2 cmp byte[GUICBHold],2
jne .noreset jne .noreset
mov byte[GUIReset],1
call GUIDoReset call GUIDoReset
cmp byte[CNetType],20 cmp byte[CNetType],20
jne .noreset jne .noreset