From 46ccebaf2b2caaa53b4cdf636a189862a0dfe518 Mon Sep 17 00:00:00 2001 From: null_ptr Date: Mon, 30 Jun 2014 18:25:42 +0000 Subject: [PATCH] Fixed freezing when soft reseting Legend of Zelda: Majora's Mask (and possibly others) --- .../mupen64plus-core/src/memory/flashram.c | 1 + output/dll/mupen64plus.dll | Bin 433152 -> 433152 bytes 2 files changed, 1 insertion(+) diff --git a/libmupen64plus/mupen64plus-core/src/memory/flashram.c b/libmupen64plus/mupen64plus-core/src/memory/flashram.c index 81cf32d639..e60b2fcbf0 100644 --- a/libmupen64plus/mupen64plus-core/src/memory/flashram.c +++ b/libmupen64plus/mupen64plus-core/src/memory/flashram.c @@ -128,6 +128,7 @@ void flashram_command(unsigned int command) switch (flashram_info.mode) { case NOPES_MODE: + case READ_MODE: break; case ERASE_MODE: { diff --git a/output/dll/mupen64plus.dll b/output/dll/mupen64plus.dll index 6dfd8b1a888c716ef1d10fc105ea9871246ddb68..f7e474f5d405a506e8ed03d656cc6444c20926e7 100644 GIT binary patch delta 3243 zcmeIze@vBC7{KxK;v?PauCDWvi4`!b(a`TTk@wRVNxuAnsjFy?Xg*52__i> z?y5zyJjwH^duWk7Xk@tdVu>fWc8Tv`t2?|{0?BQ<-KN`Vt{sux#)8<1h-^T{yNqG?jv~3qNOw0BNxBhQRX@6krzPv&lP1J%|2m%%z=5?ZHUj*!sJuSHh3(Z$$0* zMygZ+jmt1}MpP#%&0v~m+o*nwKCMHxy_ z2=D1CQ9|M$y`lzj20iFN98HMgDO6%DA~4~{FJChcy*P#r96$?pBZ?iUMKv~}0;_Q^ z3aj`N#(d1dY@}m4E<+)|JPe`T%_BaAe*BD4)wScH%|oGDtlF?@8t%6Z27sa#Z7K?1J|c*Z4xz0FL7j z-okTV@c&;+V_NsSqB7z<+1TsL zr6G5Uuus*9;ak0wn$qSLKQDJ0748eV3g{{;meweedet^k`F5x!`FZ)9=e`#7e0+VV z?$(AWg9i(i8t%Nf+~u)ytlP_1-S?2YB`(ER41F@Tre2p%k{YEiN8I1yGGkuim>%!@ zOMKZ!Ch{i{%cEa_MhuLP>AWP@*e_FWOib5H$T{)VjHl_o{>jh$JKf#BU#>Q4+&7t- z(v^^*R8fO~?Bn-hohB1J5ks-Mw#(Tir#FGKcte6D+Xzf4PsB&6w8OLdA{d_b=D zCaw^xJRp7}v-(rXASIG96DHo2I3rEa_Bj*1dF}KCq-xvSoGjqld8Z{{AKlWjEtmgTS?LELL9s9LQ zvWzMp{UFhtuhta(bNsM|Fu>&wOS2Ouw0KW|)~~ zwiz}{%u=(=tTubhUbD{}HI)^xLRN`YYL!`)R*h9}HCnr@W~Jg&ML}MYD>+!$+4Ps$(0%Z0C1h#R{#J2 delta 3211 zcmeI!e@ss*r+6`3n7R*iczN@L7XbB4$W5$#&$%!t@z>uwSCeUa(?yT5(MhxfY8Ru{#~svcYDr@_I`?{t!a8$|4`rf zxs@=#RL^>;(jTt$>o>ivhr&;c=nrL5A4*MVnx=<#l+8>)Vz_Lk^ycYp;dv$EOV9`0 zwWYEuA=cw|mC93khHF14k>u7MF}`VaM;{b#@_yCcui75h_RC&9KYY?JJCpS`_sI%b zq^7O=bosL`FgAScZDp`qi%6P?$XoT%>l{M3&VQ?vQ}^S?4)R&P-XO2(dy5L z_B2+Y7$!76SU<6Y*o#K2M*u~bK|GUrpHR=EpNSmWDb%rZqFsP0yQs?{==?>rt-nZv zRzzdsXVHexfhsgZm3h=2#Lkj{PY}X()L|VSK`9DhV>S#Vqm`2gVJqse8UgrGjPYoL zXk$^)E@BY9=tczl5JC|3SdY~xgcpKyKaqzXbRmL|(1JG+#8%Xy7B#5Ca+IRDfqwdL97R8V#xU}TsbUOpQZP{nKUSg!o3R~l;B9<_2)fbG&%a@e zV;c9t3}nGXAp)qzW^BhBP-T$%0>&|Ikjn%c#aM}2yntO8KgBUHfFt+<@8Q)`T>m;6 zHSnVVb74TkFvxn+7(oP-322`O0CcJ2NtyS{)EZz)dYH9*LMD{V!vLoCM;RCB=&!U^he-J~9 z=|=TK)RZsW%6H^Gy~cf4RT-+v4SQNdGH%_%Bh9-*TUJ(7w#>8mb8}hyqEA;Gx-|XX zOOZr(VMLa=uSKMC#<^pcmr~2|Cep^}j~{aKVsylQl z`lZ}9t*>9%!9sx&h; zwN8pV)FB?}o*FT}rXwe=gs*p(el0gh{?!p_kf}SAMK$3OYug}NM*q~E%2+FpPuDZN z7W=M_^)RN@a>vHayOEnNkKAC~dNUZy-^kMwH+F=vG{(G_$5yK2Y6g$QQIf0T4iaQ6 zm4l?kCATwnn0cdd^Rjr2HZ$*V+}I%R@Ab8^b58oT?c>_^ac%qff7{1B;ht|L?WQ?< zr#6w%-(>QQUcwWr#Q1@deSsY~oOE1r^#<)CPb=o*9xTObJc}US$077%1oAt38!QxI zIo9Dhyn+_A<9nRN81!M$Zo%!y!(x=7dYGO1IT}Ii#s}y?FQT{v{SQtM^RW;mco^$Y zhem|34`F*2v&Pxv)H#h#(0Sbn zIc?5ir_1Sc2Arr9b4c#tM-5eqnQD4WubE}$m_=r}88EBNIlvIU`4H%m12ABY}>S}>`nF-yU}j3_uEJ9K6}W%V5j67 Wxt`pD-1~EPY}=R=-nKEhKKnnMeb+ny