From a0c84f4669e0225fd065d0675cbefb064d8ae4e7 Mon Sep 17 00:00:00 2001 From: zeromus Date: Sun, 23 Jul 2017 10:00:40 -0500 Subject: [PATCH] fix luainterface --- LuaInterface/LuaInterface/ObjectTranslator.cs | 2 +- output/dll/LuaInterface.dll | Bin 60928 -> 60928 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/LuaInterface/LuaInterface/ObjectTranslator.cs b/LuaInterface/LuaInterface/ObjectTranslator.cs index bfe99fc5d8..193763378f 100644 --- a/LuaInterface/LuaInterface/ObjectTranslator.cs +++ b/LuaInterface/LuaInterface/ObjectTranslator.cs @@ -807,7 +807,7 @@ namespace NLua else if (o is Lua) { var lua = o as Lua; - LuaDLL.lua_pushnil(lua.luaState); + LuaDLL.lua_pushthread(lua.luaState); LuaDLL.lua_xmove(lua.luaState, luaState, 1); } else diff --git a/output/dll/LuaInterface.dll b/output/dll/LuaInterface.dll index 96baa9427ea63c5c3d40baac469cd72c4b632830..f566c8a5a4682a32bcf3123643a87fbc463fe271 100644 GIT binary patch delta 10884 zcmcIqd3aP+vafS*-`;L_r?YqV?lhYaQHIE7RDuCPz_61bBZe&m!VUq#atVPD9Y8`0 zh_X6}1W`buBZ5mDj6_9)!-yF(%CxDI>H%#ELIM6=I>tIp|ixCWt-sllL`x`qN;rtW#K%utJ4nyvK}V0OrLg>aXPVP;|!t? zH2P{Di$|M2^QHzb-yCgL=(d9B$k{i!yiP8moC1HFIiyck+RdfcR7Gu9L_!-ywX~bp zB+URJcBlw8BZou5OZd zyHdlf5Et;GoFeupR@iGJxpRQ5|8#mIop5hb5w`6fLHg2I!g&tD=j`M&E$(o@3h8l& z4SYEkOR8S1y3X>031p6AO&iAJN#yf7TR#9wSspj8$g}t7*zyL zNQmaHxM+9>xNR5T$B`a*DL6+p=E1-O8s$Wt5_F8D#&!<0BAMh#EC>B0PvB&0S<@@w zy<{s~j3gXsBfJtr5&9$(UgeIaVj7IVqt6dggw8R$u@g?#I|OPBP&jA<7xQ_qH?o7- zAukv9*&u~z&moSdQko@kq}j#zhuEDc|0VVi;@7E!tr98ClibB;7{^i?$YcB*t73)A zjQ6v~$mEv|Jbxh{nd?~2N&lQi_yAAhYixaxWp@eYxUiw-+lk&2j9RpFo~g zhzAVgg#}FQkcdWr^`Y!(35G4HSUCW#VG0P0zB!p#2V^*Fa6ODdcOo0Mo`AMPkYTd< z%C($b`8V(+kzEVx<;(!D42^m}S8-C_!6SBc2*&K`A#J zWu=B$P{u4;k!&50yLe3bP{V8>H!Of-%zRwQ0(g(vcQ^&DVIKSq zgx?FJV*DwYFdu$oTXC#E^xpK&#w`hZ9Rlk7`w=@PS2=Lqq`ZbWJgFKr(mLMpT9Zsx zoZwVKThu#<*8(Je6G`&uc#@N&P9VNw{}gd&@GpoC`)7!!d>0&@V3c;*(FF|UiX$A> z4GUbsWKpi}YGbl(-mB40EXDwQxd%s&l}j0fa+z}k;>-X|bU}bBTH+Xmnuh~p5SOwh%~yc( zUH)m9CN6#!;_#%-xc6N#vv4r4#1%Q)K!U#*ahPuzYPMh{1bmVFC}JRK4WhvVSR8fL zzyu#K`HXQF;{_fiB@j@EMHUcjMSZWsu?9d+&54NS@zKJtLKoPGU9srf5&r}`5lP?I zk9!5meCrY_Fee*w4azJz^F1=hAQ8tKc}&x@w9-tn5#0*l&_tpxVCYn(RNZL;mi z9B|TPPo~y5b%0x>=QGIMkY=*40yWMs$T8U{w1vZRlYJ6axT5o9~gf zep;N~7d$~WB%_LVcrmOv7Q!ipAaM)X<4QOJ= zkPU>*Y%7B$IzB|!A;ajNa1rS6jM15{^h_zY&qC=RnUs zY_r=U`{=oF&1BCe56~Zk#QVrr0>{FK>v0bP)&u{_;3NC5^@pIl$=Zen79|)r{Q3IB z@P?^7@0+UU!EuvK3!9~ng-=bk(mGEc2bY@IVtqVdF*)+|=#KhCxV?!j*YhEZSt)dg zUZoenpeFXXJ_TA0pmwETHv-%AX|S4U8EnGkI0JS!F)z%3@dIUwp@CicO!&@Z#o;gL zv!Lw*(l$A~gEj~5Hd!eAC4CO`H`(}9vgMe}7yc^R8cY`NGv3mRU|6;c0}=1)^I^Bi z9LS2{y2*~aPw0yPrxyRp;1gs^Ady)KocEs6m%@B$v+s!cv%U=Wo9rO6Qn+Y(9*eoC zF9$n*IKU|O{^3^)eFgM1X>Rxxy$t3{2IG8Q+e&!WWFGG|eI*=WRtjr$0p(yBB0IA( z$qJ9aDrTjy6>X2eUXxY%Z|IMLeJFXB!VP4rU{DjYxQsPWWm0><=~@dgOuE_w;jR#j zXI2K?qJ6Fn&|umQc~V`Qp#5;^nGw~_^%UIAtVV3Wow6CGGm|I7W>~?D_S?q8}x1?L)EVJ{RVk>;jj1oqp?e-DWnHo5p z+|#uUCYWrS)xDhAUNY|YbN|A&vuy*cOq}9+4*KR$`VBBUahB_Ou;)tlNMx~VA8ces z=VEWyet4c)8J{69LUk@bC(HN{IS3y&86&MP!DW-#BHfmk;U~!;Jz=u;3Pg;e6u5%@ zGmy15nJbxCH)f^qn?R=i3JfsW!stx>5UeyA)$mnVKZ>7|vWSPxp30dyd{a+f!=B27 zblSasQ%B#tsiW05P1^5oN_Z4Db9$NYZPoo~YwJSgeV{75g-YG9SgcKM66 zcc98-xnV`xF|dp#&kf)SFLBkvFlKlPScoq=v9 z`y&3B>l}OyN0lsgv1&g$ckd-gn{V}0Py95tUB4$*;=C}`Cm!XhpDRd2``75K{acUWt(LBX$F-@%|lvdNwP1B_-?W}j~Pr|Sn8Z?dHp;r@Z# zK;>%VXH1jT7$Otjv;5ddMTXVx{;7%m${OWX#cmk}rzyd05m8ggOq15uZ5OkdmGEQN zCCa4@w{MZ=7FBcD6Oz@=ZjboA$+A6ny1n8gv-85B^D12QoZA?b*w7}H=?)h&B*QTM z-BF^-WE3V^)G{jtSJ<8I81ZM*)-`pAJ66bJhdOEnpZG%BOlB#PUF%>(=eT`hJkt%Z zK5DExL98-ahv>=fq?^K|ioeQ+7-oSxRh*nhVM^dY>O@y7am#$k`bSN4wHAX+_Mvs6 ztBtTMkhY7++KL8~{g7--bhQ&}i>2{*XuL&SXI2XTh+pb%FA5h*+eTbMY2q7ZrO@6n z!hWmBStMdUuZSt&r^^y-VG>Vse>ew8I`0 z#U|@&;P!h+tYS(_=d^pQc#4@kwZ@4TnVolh>39&viB}~P$rg`eoTxQfLE^jW1aZn_ z&-gykCW`YW8=MmBm?XY2S%W3uC=lvO>dbl3U@B zv2@35algsZlK!MF5IH7$!gs%;SS)5H*Z(rHqKSE7nOM`r@*Jh&31;+wp7gL|g?L&T z?Y(02VWrr^ti(P%HX7MMW;OQt+BT(J9G0Hgu$NXY-fLoK-H(b3(vu(1tD1LFD7PfR zpe?yt+*vNC;4b*wy}H>0ZENtlhCa#@e&%S#C>LI3!|f?_kV$>BM&PH?M(cl&4G!@i zocH4? zJbnZedkA}nQ?uiCl1DI-rcpnpg}#HA^n?oZRfpVZtW8$UCs=9s9l zbZykgA})+vZ z*5A(SpUeu7N`=+9G%U~`SGxvlcxSi4jnrrj@htX{joBOZ#t*#$VPeE&C2zc{Tj9XXC`lslkiMrYio4_lwjIF>u@}4CIr`RI#Ql z&u&Y7%SY{04nbQ~0V&h6ZJZ`*``^mA{uR7O|K$d;TvFMse4e0YS%o})XvuS;x$BLI zTQ0^oaOo-V^JN=sh3CKEM~(s+d|FAQhtR**G+R|z5l73a1iPZaXkMy6kMMK`6Wf z-tLp@#S_r!{W-CugFHHWOXRy0ll9t zfTNy#a&qDwD$ET|LA(($6Y3Sfd%82qUdJl5)&)a|hm)T|To9j+R#)5(l#immUdfN# zf%tS7X<{SE$D&cpODW`et7Q+=8_ELT0qoZjOjED?%%OfRyi7UiWABzB?|FTdxEG}eza1WWvK@cM|ciE8jmuavBE^UW4fdmk?G>9QWEST zHo>>HEFn~*GCl``4)c#eaw;%E?0`(iWN`p~YndxfKu*Fk5vNYWciYu)Jg^GoN|fVN zAy$e4Xt0D(-V-6Mn^2w*Scz?Ov3|K?XUbcm60A6|Lol4Nb7Vfsr&9CL`a;q%jQRDj z@H%WZ2*Xi=Pf_+HO8GOCCvvhKjMo?+V*E0U($93{L!3ItOC7p3NcfnC@P$yP)v?An zAIa}x=i<~(Z2dNc%=7IWK8EO$aZ4c>-dFTbEhBmO?2wbEUs5)?oYe*0Ab z|48VjP(L%3I5pcM``I7$TM~yUxuS!M29_B?IMKkD1MsN!5W4n5*U>x?qj80Wl+ln8 z+@w?sx(1}${}w|Gz?$JOcz7Mm5>#Tc`4I;&!g3zWVY5sxW3nPY4gM%=mPfpyr12U} z<29NFwn$?r^iz9i?<&{eMg5$T&gOJBr=wX~zgEU`w+b2Sl_ZxWK5hyomiG zV-Tm=Xl*UDk^Wpb>4Uh=>XlP02Q-pbh9#;2+-s?5-Kw-R)I5d0RH;|;uyLM}?dy)3 zx?l!smg~A&tBm*eQv2~|vU=t52ns#THw7U=Qed81FZKtQsN*5q zGX=)OTgim$Q>}fjP*?wk7zp11{p499=+?7dxtw}Qy~P~g%J4|kYzwFE&P*Mq=BkT4 zsg_)IUwB)@=)^P&ZtUB`J0rPI?}2zEoW^&ruMakhh!}#H!q~}^i*irID9E%MtBs2PE1#1~VdwV6D!0(FXKg1ClfOi=3wbVFUi`k5-7se6;L3h9X1l{>oa)f}$H1M*gURmnB#ARQI z^4s=DFi=*IPCz{E9C?Uho_6RR_X5Tpw%jOrx-)52b4GCM`Gin7~%{#JZ?)S zI*qp0iyqo6EB-VhWs~(1rr(au#`||!A5r7Op0{qsg3pAVyd(B9?&RX{gi?>wwwLA2 zs83Z7!9d*Phake^we93BUC6kX(7<1!$kpi3+uCx)+X{{Q8DB?~j|NK+>k#Xe?GZch zxHy-P4<)b&zxSvXPOJ?cAoz^P711&ISf^iGeq*b`#6$51Beedja2*`59l>?*j_oKu zzy6FkHK=MwcuiFCYA~v}@3rDKT;a9iWZVT?tvHMLKI>01HZayJ>Ab(U;)Awh8+!%pw%?9&oZ1Dk4mAzDAse_h4ZKLt8oWva$`a=Y z`&sT69vZewxD}Hvv+QSZ(apElD}$A__V@Wv%EPD0M*B(l(R~Q@;Wj#ChI!wz7eH&A z>3Zc$4;@W+Dz#|+%J(7SI6R{3m50&ieQxzW*XAVS`(V%+cal%Kdc_~0on7a-q;|qX z$qJp6Wc8xGladkq5)(veBkUDwxlM7@E7uj;(|I17gF5O#q-9tDbX7(VJiH>~j^YCy z@4yJt5$TqzglkFY#i?B9O2}i?B*Y~Lt3&Sz+q*IN<{TD>LhEle25a=O<6zjgh~oH0R*fC))-N9z9&1lg=H1*Cu9N2pfMGSA3h-9l9P&`Xajp4bA6TU2#847WEEshlo44&AnXt};6M04^(H%%u)nvyw#UNaOmb0!HlDXJy2 zuvVHCeLBC7m>vBle@(l;HwB2y2k6rbAf*Ay17}RjpOiNp@Ne8b083L*H+Udim;~TO zUF5F8J-d=IT0XuD#<(`Vo3Y(5NCQ@|yI)SR!bHYNuDen^pkjL~EOZ@;wZdDBnQoHT zyJ9_7aE1lS>0-NLg{N#JHwcsUTc?P1LRM-awr%Vu{ftDyaSp-_cJdjXv?FYVhDkdN zd?`;PRV!9~$8w(_nVqajWIT{cJ}um&UJBf0xRKbK%GdBD+DLF z;<+m>8eS>4Z4@{Z8w1Zr#;C?D=oq9?4%I0^dMq`*>>?~oBh2NXaUqh2u)c^jt%Cd0 ztWX_G*uzHnc>+baEsgLC?r1Eg!3aG1oCrl|kgy&*@e5lW0yPHwz$182d|V*T)1@+%%ElnE+hl*{{*@@oW( z4C96IOzn_@Mu3uNzez#k=ajihDKvx$ATauhG-6GVIWY8h9tz!pY}k4T+RCAW$?}=q z0TZDJZT)mg)Db4L=g_#hN?XW=nHbXxyIpgYD(DOkG3&;xD=dT}v}GE})UYcQbHmiV4Z{2_E(58g;Ed>}J*#ZQWonlmRw`n8nG#O|pTsFBvej#q1CvI@8y zCj2?}5aQP?f5~#+WYT-$jv;Qde}cFs@;Txa+dmKw2TnU$KyU49M;kDda}FOA4+@{d zWSXm;T9a&*_aeH!&3Ksc7T+b*v{Nr5?($rAgkekCRg{Oa=B!tB3fPxmN1WvIA+CrX zo6^^KRtr0=-UD`w@9h&J?9Vtuql};0Pa`%?Cyc0s>4e_Tv0GN?ZfBqNET2PJzzj=!rxg}qN-Hc)yA$P?GP)q%k$M+mAVS?e>E4CdKSDmQIjQQ` zl4&NpV_N|WEk+-FX^x}E%BA;5d6shs;>a*f^u1xK=rqT@sJSOR9C0dZQUm!Y-x8XH zX`IQ^5WA2Q0FHxCYes3LI+~WGBOwP7mamtT)Yj}p)>cGxmymlMxVpfC`f{$Ss#YxuM(+sWJc^eckErP6!&ybD2 zg%TFQZv8W7TL@)wdN`8)rL!IU*hbo3wEW=g01G-wTjva$-W86U?6mIHyTgV%rLDb| zr1yZBPQ;2aeLVDnPRwX^7*^;FQ_7Xv>$z~*WPeQSqu&Q9cag0K%6)_Nr27Etfqy0Nru`54{m{;2foR{tpm9Ewr#}F% znYs@H6ZH}BuE~abrs*T$6O+xh&eBK0*;@9HJ{qu?9QlFxTlBHeyp}D}^PnrUVn~T! zuIEGlTK2d;0UGq7cExbn2yN6S!3w4&@GvgNDX_Jcd0`5S?kiJt4L`3>g-a%z;QO;a z4I14oZTI<_XfvRr$rkzc>NB9X$p&YTEyrXI-z#W4VKO~nyrCDupnfvUMc>={Y}jhD zE6C=;Rg)cXAJZQMoLc-VfhuJ4A%$5HeCYj9UjVbE&Hh-zr}{$JWwI^Eis6juS)Oo4 zUj%miaDY+l9en2ueKB-0X)oV7y#!`U27>}#+Yzq+b-f7d zn9;e|&9w`5GArRTWH(gg@^i9;50O3aL9H>?x);7S+0TBr(_O(;<`zD^SXowVFRa^`QCyp$Z-6WaGUcjn1BZ*9hz_Ig<2&nH`%&S zp>_z$OxDX&s2v8&F!Edrzj=#XRWOJdo&uIa?Hy<^Tt?Z9>SNc1!?;Xkz}UB{upDA~|%ea`hE%XI==Vq@HHLOTF>iQZAm=;530i3eL)QtiVe9Y(*Y~i>WZ97mu1nCrfNXN7Ux8uFO6(6Y58 zmsl!oxP1#Xw0bhA{mD1 z?T!;=CZjO%qKa8DTtk*1J~eHb83WvjLLNKRQGC-bzLhqUSqf#>QjGWeHW^t7nKC_Y+xEqUtdD6BNmrzsjBeP-%I)>Pr ziJS+e?I~xWc8geLvfmC#ySFGab?>7~Uva`@pCjuh zEQ_SSJ*~ohkLX~s__V|BfnsSbJL(=Reqgp5rYqI%91&P7+gZE|+_@sZL^9f8_lY?s z%QSHN-7g+tN=xT6_ek*sGkI!_5~a+(a(w2v4@QY{$%Mxe;}|6lo9y0{x79J?1Cy-{ ze58#PUz)6QdZJ^T_`ziFTEdQep)8@!d?nts80+j4M1o0IrfgHEhz2IJH)!mbDq7XD zEXQ=w(`2csAFFdjj>(ngzNDKb6*4|ATCBi2va9 z|L9}<*FF6gouH~HFqo@SKaSL2z}j3tu+~n}NdF7z3bx&9;74>7?-s~#6wL~pv`|UE zM~wxpWzfgh)hgW={)%XWk-7qQ)1SgAa4o4Or~>aRBvWDq23bk|o;B1t*_G=tCxFL~ zfC({#ZG6=1fSu&K7)ev3?_W=!;w3$y0`0kNLzaKS4ymvynXIQggbhQ4F}41(RSh<9 z;6q>GKs72VPL1YTJjqMbC`6rHQ!NUrz!*PSWrwEQNPd!sF%c^#!0=O%FL77;V^?Zq z(kQSq5g+=3&6409Or*wey)0)}29hI|C@WWABjw>5rLRK;8soG|&2_SIgF!XNM2)3u zjYbxEYM6>l^$_qk+_efcDJf<+Dbsx8r!QV&vb!><94leX`uMjRgUcdQ{$E4X@2)(cZd~VbE8eJonb%nd zJFkB-D?ln0=Hs%mKnGmy8W_B@6LBNeSQqgw_`Svg6pUbmGhdA zxoWKjo2iV_AQx0!pql-96VK=}K5%w%Xa{O6AlJEUD^HGZ>ZN%DcZUk^<1Vn^HECUz zIz8538sto;Vt?fkRMR0k;p@vPT;d9mr+|+cWs&8=q>*7vo>r-sW2K5xC8$-sK^l0w zN-0yhfF#qcD`{jnsh4Z}L!GP=<=o4~+Ygtp3Jdt0pi{5r5R>bieB_y70rJ#LPg<%9 z@cCa;Utj-G zJCQ@s7F9sXv}|jpiQ4|RGOm9G@6rEt13Q;gb}NS`s7_X406(y zN0)&wcD$sD!T)6Z58;=24k!)^z^{bx?N<__6EEM3gI=@{wqwj@6oNDk#CT|dXoY;n zo_tL-hvj96jqwXbvi4-mhZk*kLO!gtbq6CCo_F_#5lRoy51l;fKo|k^emWoa#^jNc z6Yo%AY-9rBdH+@UX;S)mYL!h^b9T(N$Mngw_O1T!pl+KhH{cB#1fGY z?^>cLKk1j&^(YSsFTu9GuztB>P5K*R8~hXHa_El3D~ATLd5DKI^3b|5^)SXfHOTiK zHtUb!D8VNv{}z<;KTsaa$u=`yX1t&AGY_R7>Bxg5b&Quflolae5JR{z+G0hbF(^Rt zKI~kQn!(nu(n)TIxsue!*>eK7eVFAIsHef(@ayG`YCK|Du%XgUr4r;r9)A0k4`+gH z73ycUlB9OB$bR-l{mPUstki>k@ZT2 zpld*?{j(V24y;p>+Kh*nk|INI!({pXQj9QD4#q6gOPDM#M1w!bnwkFBl%~8!oAMfM z3P1aefzVTJqP?wLhG+FJl`J-Au{jIP()xokn!8oNSgpjkY-+XAE=5Po_jnQ8$0i^S zx6#@vu#x@)AL-+8omDG`S@vrr&-SFKVccsOXnk7AG}I9aeW_Bd48X=Clum(msHuo_ zK+Q~DSF4o4q0VYg{!CV_EcR3A;ekPj4<+Ryeq>8Q+~gmNp3jG8snue0WWG8YI>k(Y z(Xc0tuq4BZNEM|i*rry9&r)}ze+6z4qe^M*eFaIk&>Lz#(8pks|Eit@H*atHoSH2@ z;C=VD{VXPHZXvv?oJaKgHbYN&mI%7_tX4kBIIG@lj&HUv7B#DU)ZLL8gVbDgVoZi5 zSKZ`mglJ7^YQc>i_O(LNR&S5E(?{dW3UtS2s(%2YmoXzI7v&a+anRB_$#NO~W?x|$ zp&r%NqTDHFg~i4C0v=@nUb%j6nE|d06~D)LANP@uZ@>#+P5^%aqg3&v{FTv|9WI3m z@d%E!TIuVL(el-1;dsPn)8na=a%;LVz*?%5CJ)8NdojdGxZ-wO zve9XnwOTaMrdji0fBJgsSxmnPn+*;CXoQ-U`;w^>7y*6+Q%6lV4h!u#{%4+{+ zJT5*6=0Oom#2QqHU+i>x4#j6guCONLVV&-_JYp-u!~^jMBeed@a2=G|_TxG@WIKq@ zuTK&0kEq&yUK3@!8jLdTdzA>`3a=7xC7rfaiN7HpVf}H&6O7eLL*Czy;)+Q`^cB*Xq%QX8*Ty(ST)yh4}D*F*Wl<=!Y%R2jUIOi@$y<($7rknQ-dp;!K zOjj$P#n91oyHbVLlYyg%qwt8v2d|}$z6)|Vk7I-LG zp@rg6&)8ci%_84n0!)=c+#*%?~k9pG&5L| z+++FSpjV&s=E*%%s(W~vW;L3TOD*xuH>3!F{rHQ|{bv9M4D32^Uubvv3!g{3>=)B| z&rTiIW6!BGjYYJ-h>OO2J>R+eIZCR)?&tQb{d&G|WI;>F!uNA+_oRN?uO5xg{O-0o KBmS7Q_x}QB!SYG~