From 9249593f2659be616b8131f0b5e8f0982b2321d0 Mon Sep 17 00:00:00 2001 From: zeromus Date: Wed, 26 Apr 2017 15:19:31 -0500 Subject: [PATCH] change libretro LoadNoGame to be more compliant --- LibretroBridge/vs2015/LibretroBridge.cpp | 8 ++++++-- output/dll/LibretroBridge.dll | Bin 112640 -> 112640 bytes 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/LibretroBridge/vs2015/LibretroBridge.cpp b/LibretroBridge/vs2015/LibretroBridge.cpp index 50698aab6f..3442dc7565 100644 --- a/LibretroBridge/vs2015/LibretroBridge.cpp +++ b/LibretroBridge/vs2015/LibretroBridge.cpp @@ -655,9 +655,13 @@ static void LoadHandler(eMessage msg) comm.funs.retro_init(); retro_game_info rgi; + retro_game_info* rgiptr = &rgi; memset(&rgi,0,sizeof(rgi)); - if (msg == eMessage::CMD_LoadNoGame) {} + if (msg == eMessage::CMD_LoadNoGame) + { + rgiptr = nullptr; + } else { rgi.path = (const char*)comm.buf[BufId::Param0]; @@ -668,7 +672,7 @@ static void LoadHandler(eMessage msg) } } - comm.funs.retro_load_game(&rgi); + comm.funs.retro_load_game(rgiptr); //Can be called only after retro_load_game() has successfully completed. comm.funs.retro_get_system_av_info(&comm.env.retro_system_av_info); diff --git a/output/dll/LibretroBridge.dll b/output/dll/LibretroBridge.dll index e23c9fe43ef5f1c48f2d1642572f879d611d4262..1b93178174fc7ffd7219740e8e2a27ed65365049 100644 GIT binary patch delta 1938 zcmb_cZBSHI7{2ee65y&A1%*`>SXd=cxXXI)J?HKhsXHNxE-I+0gyvUh4$iR2lm-f# z%(@Pa)hS5^$B&`O48?@8R21?nOQ&=)Ytkvvi%>2`Y9q6^b605Sr!$?|XWr+W=Y5~^ zxwqUOQtl6F2nB5o1M_$4pa(WIf~H-o@tYgvkTrvVZJeu{5FS&n1;*>I^4zXaz+>F} z&|{eGRy?6{b>r@lB_klUad?Wi6E2h5DDZ_dW?XOz(Xv_)Pn&|l2`OF7JeXG^dP}U z8+Q7EzjFk(Z%L_ zyPuj{T6}r_Di{6rRJk5kxq2%C&wI3%?>Y%RAVcP?|6}Sw1>W{Wt;A=5g|L&{GeCo8 zcsFT?he+rphvOg$?vQhFkN`_bM;v5m4&M)onwqB(Hj}J)snd2(x-l>m7{)U~@kGw@MwQZ2a?2@y^sDOL>DG&smGj7>co1PcNlySh{7JGC z;3k|SDMq^C!(^%v(ql@y1Ipe^>R`FxZGCiSSoP^gKMp>hD;JU-M*32^$t5Gi#N2JC z<}I4Du6^rs-BqqSU(R)(YoA-bOaew2HSML}0*ZG?gSrl%Zm2BNt}myh)0lcb*X?uF zyJ@t4%zHaeS`gl z9esTR2kg@q7d-fUuSZt|GH(q2NqsqNZV{93mWSUAC`z$b;p8@AGJz3zl4Sx1JS6X! z;6T~WodKmexfa-tJu!+BwDZnM3iVCWd9!a@&dXn_`gB#_NcDfEE-LL&rP4iATHaq8 ztf$A`5q*nZO~20vG`WN(d$W5fD^klU_tUcU7zLE37vF^nIF<~Rb5|FS12*#oVC#~B zWhod6KOMV8(LhnI>J&_0Q@?yF)lj5TXlsDcR?s&}Tfe5GJd%Q=8aF^A{xXOTemk3V zfj#rN>f2?ila zunSp2p0GezEUXfWg-YQQ;d9}*a8bA-JP;lUiV!9a6Qjjg(I`$5v&0$VY;nH0SX?Wv z6E}%l#qDCPctmU#Pm14)zlsk;4GKlkC>ilcLYc^grXe@VM+?f(VzeBsMr+YJRE{-x5PQjCKHlB&|@XNRmFT<;F zF@6KTg*W0YcpH8X@4|I>KmG#Wz<2R|{5K9@trR8=lOiR(6epRa6p53{c*!bFk)}#B zr8&|HX|+@$t(PjLDrtvQE7ePfq@&U)=__fJb&S<$oorodebZWPJz{OMwp*WABWxC% z%eKT;YTIr*Xgh1WW((Lt?2-0lJF>g%dG;mt1NK3VaEHM$){)`JajbA`bZm2UI)*uO zoa>x#J8PUDPjnu2o^oDv{^IO%_BeZ;30GP}&v%(>=;W=)1M!=6#nbnOtNhW!H)-?d`^ delta 1925 zcmbVMeN0nV6z}PZqE_uhkQRheKE_1gwb1wOyZyq2ZVQSlsD(r%bHs1M!yTB>8VZWc%cF(+lrRFv+dzI#A=et(gc(~yAgirFnL1nDp#YgLQ0p4- zir~`idgO{(9>++qPhdZxBRsI2`=589k^RwPo2tNxLxud~&!#9>hQx zIUfm~P)$5)Se=-^R204E6+V~BDJ-YlDY}%kiZdPEQmW#Nn|fgt8B>E1<`PB&G0;NZ z&_EJgAlo&7VGlW>fdpkiid07F>lOYUBfn@M9+F8&6l{h7c`pjCr!py^62k+uT8TDD zMxgnOq>;vGuswfXre=+A$U8(o)<s%5B{sDcVcD*>01mjadh|| zqSisW`t=7B;-^_sgD?8JAOAYP?(E|mb9(axhOF1oOL3Mo=s>M*zehjaCGW8}Rp&Ws z?T!B2KEJ)mA$&rv>R{3GMRzAe-`rN|9De0Ip@S~{xm|<0l-@jt-+s(N!-a?a|B9&( z#vBu(gTC*AeO#m_(3=?#JY7Xi}^b%h-jTcb9 zaoSqaC2XU64=JiCKSFVQa(_yfe8;rCid2mAP zNIndz`{im;4A%0kP6+kCqV(kqWb_JqBz=XX=TZHcG(@FxNvb?TC3Y$`m{0qDU${;C zK2_%c4bG;)zMOH&u#~p*GnytwiXgUol3*2_Oop8Wo82$bS-uRa)?`p=DO40PiU8g3 zqNtN}3fZJdkDWy26e$#ngCJ9Q=_RE$r70<2NWoBznWm9I4MYZ?%XXz31o>R80c2Se zYbib;;DtpHO4MG+SfJH`EUjW=Wktf4tx{>Np}p7(D`zX+hNoxApywbRe$c*nEfHj` zNg&fwv{J5Zzwd{(80aL2njxbm$!IigHSRYy7(0zU#-EMjMg<$jrm>l9E?dZMWH+(p zY!&Nf>)F%nx9lbMC-x32=Vo&AIW-r{C3C5qfy?I#xngbu_byk?dAQx&UhV*Qm}}wA zalPDC?iTkaCr1lVBuYjI*-;L1pfzYMdK0~kHr1eVv>jC=5893D(8uT?YD69A9J++Q zL$}cY`V9@EQ8b2RdSMd>i6d%Vg;nR5|kNHBrjCb)>yqkZY_wgU``}qd`2!E7s z=D*}m^Id!of0-ZTU%)CHi4*Y>%wQun;Vk?rUXJsy6Bpr{_4plJhF!P{yD`BHxCuAo zuka~+7GK4E_!b_(!*~?GW?Es&H*GW3o4zo0nfgs5rf_qLd6{{G*=62qK4$*LeAE2M z9AZhcu$F8~p{2y)vh1?#wftx?TCsJd)oFdpy2DDWC#;>;D4Wf;!*gnUHU4$N54mJFytGy7@FFDXn~Yj{{YOJxBUPB