From d100a974eb731d6c23aa831c17da175a2774dce6 Mon Sep 17 00:00:00 2001 From: KillzXGaming Date: Sat, 4 May 2019 13:09:54 -0400 Subject: [PATCH] Add null check if pixcturebox updates from other events --- .vs/Switch_Toolbox/v15/.suo | Bin 1245184 -> 1245184 bytes .../Editors/ImageEditor/ImageEditorBase.cs | 3 +++ 2 files changed, 3 insertions(+) diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo index 3737d14f8f415454e6d437a51462ff4d3519511c..824ee5311ab53120622558f66b9ced7d02f97521 100644 GIT binary patch delta 1307 zcmb7^e{54#6vyAW@4ol?+O52H3(T%9T^%@vx`p9DB5a@tC?R9Y{$gfEgBTcgN)w3$ z3mDM-VYM8P%e|nQo&aeB< zyZ8G}UM#jc7F!*!-oljI%Tg2z6s3T|sa!6X&#J^cqKhb^nobz`JwzelCNfk5O;L6d zppzxQAWMKlQ7%w@gs7suJ4~!!3H1jPVd!L=&5RPb`X)OKE0R(6GC+57Lj4NhLHi3W z!9Uv&>`Auiy8(22!mwe;e$6ok8GD<#0)9yzGi%&%EjckGXXtymqRcL_ua{LM!=Wh? z9bVAYjzC>U;z;Ul*jL9#=q|En6AZ40A{jjiBkaDsOg~ckC*o%!OxKJM zXUR_!zmdO^_=7l4@daY4SLnXQ=i-uX^H1XTJX= zaSG7Md9Bk!gL08B(#7Q?oTmWc4K*l(mz=`^5#|}eHHK~Dyc1(D86LU+va7ii2W-9$ zvmfY1xaq7>gEO!21SXn|8MwW{u<&q(a@jjH6Z?YN$Fe!B?N1A?Gkk23?!_lG)0Cx` z3oe$5kUlK9!Nlc4zX%!RJIHtY_k&%D2g&qq}jxh_bwz3c| ze2Q|h-&rGuET~3nG3h#xWhL11BJ*P;LR;$RvmhQi$5ta-?ir8+8?EY9INZp*n7zoR zWAFxZV`2&O$%bK;C==tRMauCMcOC(EUZzttG0)TZzo6mQnsc5?GU0blwG{^fsuPbM zAWirA)Q#Kzt8saYY`Ng?Lc}0_M?s5a1!+_>GFJ|+07{_A{_*VAE zT@mPx>j7-|RCi+_t=Hg=Mf?DUwm7_)9@1-N{2-4sicy#E|Emvz7cgAg%4f-0<=W9# zJ&)4G{$1X_HRPMv?=((hwuft&xr;t>E69{{U=;tKt9v delta 1135 zcmYk4Yitx%6vyY>xp!W>Y-fv+Mz*D0n?|;^U0Ty9wz4A9#t;*#H1SQ0ff$q&Wi>>C zYumJneCRrqBf%IjIGE6sHEZ@JK0*s0q*WUci$&BfZIKwGt+Dk{wq4IOA#svl&STD; zd(MAuBC#ov*who3pHxaK<0E{dFDp>-!qHLi2{lo&* zED|?9oF~7J_=o^gQEI4WpNX+%h<%s}!&~e*(~f-c%MmsT8`E+2D!{??occMydgn8d z;!loVIFjC_bpRO7obJF+&Kt%wOgMYYCKyi-nsovAH$Ar^uWMa2L`9J^KNd-sm*z~k z&nb(HJG`<;Q)tv?NS9Q$st`-Zt5*R8)4et0^{~!~Z>xbR=lyNd(2?%l{>d450XIkB zgj)%aOc|Lfczazk#pOFYVC-=yl<{+LjWv!LigJnY^tnv-2jWK}Ogpv_S@N$Czmnff z{6So$_-A4+@@*(Jy@mV-~2YXR0sgg`}xe?ZSs2#%2@z#*Mr<0w5 z|3?>f!#lW}_QlWvR%Ln7vm|XVmn{d_dSKU#rA{)s01@W)u-)$OCd+X3P5_2?3H2;2 zV$uhzF*d2Lm0Jz<=$r07i@66?zx$s0G{RxEM3!iL0<0nLmr{R~p~ZQAXATr&5jKn$sdG zqlWhNb$4nRrF7;RI&}(=Z!p~ayhvg}R5W&v7=|1%%-TKfGd9DPb7n2tjf~6s1RDkn z*V(V*gO3Fb+0$jVHQ~U@;G?+n0)*w>e!G+2`+|jd%OlLj+*;r-8S-ZpZ-l1pp?oSokL0a=ssC zanOLTC=|uj;vmXt7dr$Q%~tDaBqulcb>6HDAW?ysA~ns<8I$6_S}!ByU)sAeloMUN8o?{jDp? zKZK{iJlX3+j#%(=M4nLS)@H)S$=~G3>4GhGF{60tN|5D*AT+}3@x3hO_9SFV%?hKt U!m?$B6}&tsA!X<5Twa*_4}Y$7iU0rr diff --git a/Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImageEditorBase.cs b/Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImageEditorBase.cs index 5e988102..c80d8adb 100644 --- a/Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImageEditorBase.cs +++ b/Switch_Toolbox_Library/Forms/Editors/ImageEditor/ImageEditorBase.cs @@ -333,6 +333,9 @@ namespace Switch_Toolbox.Library.Forms private void UpdatePictureBox(int ChannelIndex = 0) { + if (ActiveTexture == null) + return; + DecodeProcessFinished = false; PushImage(Properties.Resources.LoadingImage);