From 73511a8c3c65ff958e9070de881b571b583052e3 Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Fri, 11 Jan 2019 21:26:10 +0000
Subject: [PATCH] WinGui: Improvements to the installer.  Fixed the issue where
 the uninstaller could appear behind the installer.  Updated the Background
 Image on the installer to the project logo.

---
 win/CS/HandBrakeWPF/Installer/Installer64.nsi   |   7 +++++--
 .../Installer/InstallerBackground.bmp           | Bin 0 -> 52574 bytes
 win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi |   7 +++++--
 win/CS/build.xml                                |   2 ++
 4 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 win/CS/HandBrakeWPF/Installer/InstallerBackground.bmp

diff --git a/win/CS/HandBrakeWPF/Installer/Installer64.nsi b/win/CS/HandBrakeWPF/Installer/Installer64.nsi
index 50b134631..59923bb87 100644
--- a/win/CS/HandBrakeWPF/Installer/Installer64.nsi
+++ b/win/CS/HandBrakeWPF/Installer/Installer64.nsi
@@ -33,6 +33,8 @@ SetCompressor lzma
 !define MUI_LICENSEPAGE_BUTTON $(^NextBtn)
 !define MUI_LICENSEPAGE_TEXT_BOTTOM "You are now aware of your rights. Click Next to continue."
 
+!define MUI_WELCOMEFINISHPAGE_BITMAP "InstallerBackground.bmp"
+
 ; Welcome page
 !insertmacro MUI_PAGE_WELCOME
 ; License page
@@ -107,10 +109,11 @@ Function .onInit
 
  ;Run the uninstaller
   uninst:
+   CopyFiles /SILENT /FILESONLY "$INSTDIR\uninst.exe" "$TEMP\uninstallhb.exe"
    IfSilent +3
-   ExecWait $INSTDIR\uninst.exe
+   ExecWait '"$TEMP\uninstallhb.exe" _?=$INSTDIR'
    goto done
-   ExecWait '"$INSTDIR\uninst.exe" /S'
+   ExecWait '"$TEMP\uninstallhb.exe" _?=$INSTDIR /S'
   done:
 FunctionEnd
 
diff --git a/win/CS/HandBrakeWPF/Installer/InstallerBackground.bmp b/win/CS/HandBrakeWPF/Installer/InstallerBackground.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..7499d028af13c3bfef1f790a4b2c28cb14c258f2
GIT binary patch
literal 52574
zcmeI54P0CGz5ju9LZl_&L$L1N3u#j7LuqeyS}j|>^G1ra^<j0^r|LGHw7`^bTB0q*
zmbMhySRdBu+}*V!w3I-mwkaW1I#*FcNT^`JQXPK_ty*0@n`}T3vfuyn{hbq@N+_+<
z`TGCQFCjVSBsu4u&-d|nlDxQa@%@cqd|W#zEbKBY?Zn@_@UXD(uqf#P++GkZ{b3_L
z5H=|$j!n8Yim5N1&NMTwVROEBEzAA)YuM`K*(~ywI5y?si`jWUzKqSd=X$1o_%e3E
zLo?Zwm6x;Fyy@(`<=3){GUl=K^R8pD=DF;etn1mus$1Fj)i<&W<}PH0@88V6^POCF
z>6}N{fBt6{%fIMmW}chQmTK0phhiUR@y2^tQrg`tI`1ZSwQw8z?(L5-{nA_(|Fc|n
z*@J7?qT7GOR^D?5yXlcT*@C-%##Svfu{(Z|&CHKI&Yr(S!>pIavZBPP?AcjYvfs_Q
zf)&lakv+NiR#tx7t!&G}O!nM^KW8uJJj%}dwT4CRxq!uNNMYZtGBCr-Guip?#IwmK
zE@j{KUdfUVUCS>1bQ(+S!1kgA?82fnHszUxEOz^?OuglHc2Ut1cK)w^%r1QX9(HBP
zoosUHeJsUsBa8jba&}G0L+tWjKg?3LXR(-_53*~jR<ebgm$IAoEo2KeFK0_PXR{wZ
zpT+LmDzF95=dwFrc#LIkHM1MbA7gj#evJKm*BW+x%Z)6~oy!*amatzOTFD;x>vFc@
zWDYwo`d91{!wW3wil<rh#e0}0=@oXxReRa}nj*G5ZaaJIVjD|XwvOqRt!EcM`YfA~
z{WQDqmTGowssr|TiOpQIlim8GU$RGUv#|8Xf5l9zEbNvgud<~Ny~?tF;bJkDzRfP2
z<z>lp8`wp+A7;t7A7arthuEAIEiCr#&)KwlPO^(146rM*{?2Z{)6MRD*vlTt^{_Od
zgKfOzHD<Z4nr*tTh&{7#AKPepnUy`}V!!;ici7X(2ieZ={fYfv-^HH0@sF(Pfo5j^
z`8({DMaP-*CmpPA%_r=FZNFv7Prtyfbrmvo@jiA{@m_XerHjp|+Rtuz>X$6{sVCWw
zeqYRTUV56{^2|QA;<-KSu2)`Szj)cne*VV)u+_)bu`Ew1GrwKNes=Hxi+sw>=05*6
z)7X9N`#TS_g}-#Owd<SMf{GSqs&cc1Mg1)6>Eq0}?<9+@e~%^CHL{rZK4w?9cCy${
z``CT&{E4mbdDzO1c9#BTAA9t~31+ca*jD><Z2JopY|n3h$F{xnGJ9puUgmzq!HSPs
z*!GWp&9-~?u*!NT``<rXnf=q3+0j3~&NdXavR9vOVwSybw%6%lFTQw;ZLj#8z4Xe*
z?9JysV2#yBS;O<k*}E@&#J0QLY-fEvbG_wZm2Gv**;dc&Z@<g-H@wR#4<BYV?|;Dd
zcf7-1JKoG*{L?X3>-igVb$rAQz0<@zpEWQ~mzQ}yd5^Vx^Z|RPyP3V)eV843_b=?z
z_P?;UlOM5@Cr`4IfBQ2#`RNzzub*_YQ-AMb|M<s07^0v51(cyEpeUdypeUdypeUdy
zpeUdypeUdypeUdypeUdypeUdypeUdypeUdypeUdypeUdypeUdypeUdypeUdypeUdy
zpeUdypeUdypeUdypeUdypeUdypeUdypeUdypeUdypeUdypeUdypeUdypeUdypeUdy
zpeUdypeUdypeUdypeUdypeUdypeUdypeUdypeUdypeUdypeUdypeUdypeUdypeUdy
zpeUdypeUdypeUdypeUdy@c)wn{UhJ(z{u5q?V8^&`o*3uKSuv(u+i)P0#d&ywzP<1
z7g6HcCGz3tWCH=Z$YXFJxZ#_*?-v_=%>X1ge~Z7Xhi+-LMeM{jP6%BGLBDxSzt7h!
z`oIJ6dSGcH?2?3RX>RoSe2wBjU;lu_7$p5hF$ciVOjd?!M23sM3l^6~XNw4aJOw`5
zFX<VS^P8g--99cMkSJ0}CfxK7_y-U_WbDQkUt=dI@$kUFfGj5$HGt=S6GNO!h6V}|
z^!NAm`*Bo&^bhnCGMAGa!6()er8Mv;JqLt?9{M%1iskNlUt>!b4oDL91^NQGf*{Zr
z1nLnXWg~*BAqd$6vva{^!mn9P_guHT0jZEK{s1l_IiIhYY)i7iHHlT^PU+^5*ub~>
z`(?X-jS|wX{mIMRjili~-+;f*FS<vK=5ESE6zyV*&+Sg8$d?GAB?eyjwVPX<>lO$6
z@InMgKm^6mD3=y}q@>t|jP6@DH`y&mJK|o}5-##JQ;KeXA8FVJ2lEf{!2#Ul1@2_r
z0!yknzU1U(VheIQA4v9o5>t}$Yqa-3BXUeX0s8%&GGns49Bj$uxWm0W8ICCrK(@3u
zi;Yx!Fer;sS^t_14ioqF_emk#C^G_WZaD-jrwf5{Aj<JAUN`Cv(h!v-jIJJk55@S`
zoq)gyP(Iw{Ffaa+p(58YS;FKz{KkiT-;AQ<6Q$w~KZTUgks=&!IbzW2s1|R;;}c$i
zm8D#b7~n#Zo%vWsGOht@BjI&|3W;1E&5fP1Uj`!wG{nS7X@T01f8LN)B=>KGiZUT#
za(gHHTEr7AVoN(fn;QlpeJ#xplZ)HSjQ}N)UHiznd7?!{MV_a4?5CO#yqrsA!mjw}
zqE1H)x+E78v6EcBj3TC`6Ecdt0|I3bv_)=22$Xk8y&~mN+{%M@qEa3OZ9jPxh1a<Z
z2q0nhbanY;OE(ZDj7>q^ETZ>mL=GRM8(Q$S_*xpNoZ}C^(8%8hm8nLo_&T|p$i&h?
zNanK*G1y0H9?+1r_`yQq;-2fp4Pv_72fj{R8#}2w4j(}^hi~(_J(I%XXVTk?pL7M{
z3xi%ah{`#6e4VA3&>yeuq1gfIa>FvW8$0zikc?R18g@d&5u?H9#g#VUrhzW*2KS6)
z_l&Rzl{PVP2L02;h(t1mL<(8C^Wq?st4^CLjgLG`NJ11vH?`xm)VQnxPKe1u<7f>z
zF1Q*R>OBqh4Q`)%MnrsaJb{I2_4<T_um~-Ugk%i2N5Yg60nY>H;FQ$zV2C{wHt55;
za8HoFPDFE1KAJLMz|-2KC0{*h+2CpLy4{ITPel@9==J)kK-KCKaM7wFRFKn4n2nOn
z=}>1II1my(Nw1{Ffd)+s!Po=+c#r05L!$AuAw9w`Tad(MNC;U^GP;uqj-*Qf7qDPw
zLZzXKh=|Z$AvrJKIcgKym$QYW+=W&UFO}G+Z^Tj;b+%}2QCFZqGm0Rs;Yv+;&_6v5
zYmnwuAOfIFr3EADXqrA9I&#RF9+DAd6nPBRMiLs|0Z)I_ALvK-C=C&Y=5FbiMMe7N
z)wx|N(WFHScsp@S8i)=EMS|fbX}Uq5K$_B@e!7q(Bwzu;YRl=lTu0t4oz8H^EqGUu
zU&=vTL(0Wi7#f3s5_t=>>}-K!##3}e=pmg7h`E9w5S=s<^a9CCUa3vwal>;EMa|jk
zi1)yqQu0cfO;S^)1TyuIyqeGg2DzwjCU-&=`JYy$2ce)3njD-EanLUfiBgY;^9vL*
zXKib)Gp2(SJAIfK0s@iUh`sS@My`o);@*ndjB3<Fn9$OvQUOUz?w5eebU`ps*cc!n
z@g~3*DSDEy1;Fuc=!pH$IHPGpJb|>N;2FT-@n&22&W3KJ)`73fQi?OVT@e?Od8PcL
z*OSRH%)sU$o@>a}BYd=4A39EA{7M}g_sV{9L}CfX5$D1?7(Tj@>=Owwhg?n?S}vPb
zD+oLI6|RVQiO?nhI7v`xwFY^=edlKCL2cnHWJ&*kh^7jneu-G>8~BnFN^UE``Vg(4
z%T3~lCSW9}kjBG+0!XXXEEr&6{Zt-9cofw~8&OVg6UG`m+Bq)(k#t1G;-NHn3pjoy
zpAc104bBJ~>J8ku&=aDO*%K1LXtgHhLggGTagtR?g5_0VBHr~mJLB*-1Vl;@*dzs#
z3`uKz5PKqu96}k%1t|uWHCq$)QxV8h^%NimY!W~#Oy`JL;7bYGndeZd<)e<gLn#qa
zu|{qjxz?#dB|&1;N2ti#NH>%jLyo~@GC@@XJxFefho%dr>991tA4uFiazE$1CYyS^
z*RP?BNMReHQgK47724(Ui(s}=fIw!BPj5khGfI)=8E>y=@ff$YIPMFmgFyY`q=}@W
zLm>N_IS_c^18`T09zNg^Q&mts#~_Tq-*FE*{6V-Q)xzPMMlVAp7*6VMw8SXDEfLIE
zG9#qnlTsdnk~;*ekVwp7VN@Iw{|P~jIkB9gM{^BZ@8n&MmO4gqG7zXD41@|n@t0^a
zp(zVfsq~0&!ECnTNpR2zl*^=q@?rZq=S7&BMoZ`&c;Ie0tSUm4z>A6sm4*y!wK^R%
z5(T6kNR1#Tb*($%u>d8(i0BEu--$m$r*)~73i%3O1TjuW7X}Z5zZp28-k>!*sxe$v
z1N_oN864SBN<#uqlv;{&t+q4do+tbO+9=GF+`f<w3H_+M;r1p3n2}lsY;icM9WGZA
zkCR-%B<ORd8!%J?b(S>vvnNd$CDapf4xeV%4c<@@2pPk;52D546(-0C8k@sm6%1xG
zk8r8C(1MPV5U)7~M2%h*+C-tCMs24FJ|-#k4Wahrrb?YKJ(uPNIJVV5J(zZ?DJK^t
z8hJ-+u)+xuEYeUx->F*C7KJm{piR>2uNZa6vt8|iguVvM_}mR4gj^G*qN)KE2@x$A
ztd7|WwH0Qw7U7}75`{P)@Bzx_QaVpU4-6+wJX@$y&-Y@w%tw8wsF{I|7V#3nWkg0K
zPs}l)#F&v~3=}I`IS&ESmSCXN7=cZEpg19rzFKeANaw_9LJA?>V+(l&468@FQDIhv
zguMfekBPz?gjR|Wh?<}Uo`bH~Zlb=D>LOO?4d6ZXjuPgqRz+#LM{_<p4>IO!F^PdR
zXmP@l1nUj~{)ONmK-8Fc1EuOqk#ex+1SR4p7tf}*wF8mFRn_XhN@sx%91U*pTma5|
zjRi?FerkIXxZ?>4RH+FOAq`8@gc?erz&NnQk%-Djb46^z8?wSJP$l(a8)&S9joK!i
z7N@hi)IDNy1>T-9lH?j_7)*#bK1Bm*=y13k1`}z9+@52CwX3TgJ1CtCQlkrLsc>VC
zmT*pt#MIsW@iDKrva%8fv{`NYj~w|(?Dco`j>e=3E4m3B&0vU7=~a-C2*GGI!TG4q
z%|VnW3J#|gG9p<box>3kNC|=oFH@a^t@(_)v&~!S_0-ra?Ugn5{guv2TV<8gW^)1*
z6Nh1viwIK8sL6WBb^y{wz^<r*u3BVnGc-ex153~vlC%Z{6)BmEi4U4cXwC~x<*@xt
zWU)tVYim1#tLI4Nkt6$$><<oSrQK$?0kaC6U4y%7pr$c`&f)2~qhTS!N`<=C1-Aqw
z0YW{B4?S`>Z`Oc`Mwhh2JQib2M;|=Is0FdzdxS1Wj<n%#a1f_!zsu#sr4n-5_ICz-
z$W2`%g|&WqE?_A@Oj?`6RqLuX*och}L`*!{6>S8S9MTf=#Hr-GK-VXJIf^6ns_26Q
zdMiC%4^hhFSn&S+BX1C@-R0bg7_DlPD8b05s8kBkBqB;-+eDYE7N*A2WJIeAZpu?-
zA_(E(usu2>6*}`=w7S}f3JF3)NM$+QzzxA88M?;qMZjRtdM(s+IjgH3j#AeN@=Jam
z8B(I50Aoai3jG--(}K$yZ>Gq>kn)gOm>Ll=X=(zcN(=*vpelkQjQR?1XyJxEGSKO%
zEQb|swq2`jwgMZ11c6cm+$!AI?KS&xB^_NZtIcMuc2w`(yI<@MKt>Ge&ZhH8m)3v~
zF<ave2Gby<!{J2oHpTN?nIJJHA|K%`B|uRyPDsZdU*(!z0JN?)uiZf@80khDP8%-p
z!74<H)8-;?v_YBb>b?8+R(sndMnED_Qv*(A1~12~6{l4UXdkOdco#7e6CS7ZiN+Ub
z<h~QvQS?@>UcDMG<{?N<B+ZztrB>;>Y11YLxM4TSK!nL5_u3OVB!UL#l~HjhR`FUy
z0!p>X6mPBNgBZ;;Ux0<Vv3YZb0!1?%z)nEN7H|3L)q)L$%52WV)tZ-=S6aFk*S)yX
zC@L)6h&xKoRtHhyvTtu`-d?MoLsD-51X)H@7z7BN0WctVYTrU0LSi)KOw~hO-c|B~
zLvfDTH?mdo8C#zguT5A@`2c`<=F-yALJ$$)#==4ZEZvI@MI3VPUWx)I9}X~<mgZ8G
zp;;E<8e$@1C?d%Dv?wnIfpmP!j5h}*F<-#dpiR_LD$k{&h&+klNgfs%V=nr<YlYQR
z6!L^pA_Q4cVG(4b1yXNsF>R2SvFdPa+Pal|6p(p&fJDV39m(6csnL{aBPK;aNHd3Y
z8C=kxAk8#mK<ef?LctuYU~+gSM$u#2fj5=Q?aK+F8qsYmDk>^0E(R19XcW>ijZGyR
zo_rEok}s6z<w8WnG@=%|pbT4G)Fnb%)EHnT3RV<rWGhYy{h%Gr?ULPcaZ(piW6-Y|
zQ@p{AqOV*KR^{cbS_xxr+*r5~f(?#hEJ4P>^`c_Z6;CPIv<XT&p?coNJQx{t@Jrn0
z3NR~ah00^1*mD?c(9P;_f|3WK5HH}QK=8Z@$_(T@L&f%03gBA_<u>3l2v}Ui$@rbT
zB$M*B!jcUoo19L#<i^6hJUylha7zSDl3|Ax9S;PAoe2>Y#(`)-uB;|0F${t!9-e_n
zr?)~bnWO)BP_nTWd_KXva#i8V4I4L*&w*(j{xJ9rEf5pu8d8&%Hg76{lH6(Y&|4?a
z87V|JIx|;wFomIka8wfvW-(?*Er+zBV}o17!z1BhFn|_OH11g+zt1M*LBdyG+f=-%
z1SrKtnKB)gr9q4|a623pkWWHL7=B|ZAgQ-Njzk%OtzlFeP|Zn|F%i`~-ilTT2_0F8
z7%4L%jpiV@5=^_sQg3jZ&uh)wP`Jt2ed^TvC7fhk);fL<pv}@kW~RIl6jD}obIB$^
zB9s7`1V$2)&MZ5v@svfS0T~fLm<a0i)C^VE!t`eT*@MIgKUN7x26@I<=xSL@Dn5DY
z^HbfQpL+jQ2(>PgGnTB+%zUC4*qe(or7gw9g(NYTQlf;CC0h|;g@vWL2F^%ln(=|P
zAjrN~UF$^pQB6{5O$GykyVhkzHw0?Dn<TCy5_p6#?#VM>+seWX8#bLfb*dMCr(OlZ
z6PfFaOG--CJ(2mu6YH@+OR|uF9qF2zOSV2)!t+$FK;;HUrq4A5v%!GgsG8EZlM3}k
zV1(D1QMwJ79%8y+(3_B@446iuAPI&s<O^=<64ye-lJ|SNX`Fh$xVU69<SQxJy!i<}
zfVepmwCe~K%0fuU7PNU$@rIHoOR!d0Tqq<;wx&Wt)x_W+!rEGLOq@O8r-Bj%mjNA<
z17VN$o6pZoxpb~*yqTd$GQt_VyFq#C)RRSs8Zd4KnZy`e$^>K)U^CYj6|IAuz$_+K
zxa3x1EG%4UkWP_8LzoqmiB8nOx86b@0wr;wfj$H269I*+gS>+aO%jnG$LSx%8pyZ_
zGIAkXK~lUPaGRejp*swqNefS`!xn;EM`~tfW@W9*%E$y>$*K(-H*Va7W^UImyS=H|
zjyi`tX%ftdoKfI~8hohYD2%2AxFJ#!Arc-2eL6Ds=>=}?7W0M;C0ivKySuj_TsYEt
zNyc@+3mRPl%*^J1nVHKoGc$07lB)!Jz1MrJqvI1A9bVfGOkq)~Q3cWSyyX;7sU2o$
ziLMTan8aXmh{4(Dv=6MFJ5G=5??mP<X$9k#`1>$>edZIAenVukiorYb%^)ZsA>``H
zaxcb_j*gR`e0<#NwV|Its+mg4B_&yBqVJKC5Nr-Vp!7saA~m91MyQ}8bw9&r!@*#Y
z?nNKU->Nq7(RhCy5%2+05^?mP$FqWnBxP3N%3Vb0^>%a|>+l}KloCBFecX@Y0yM$t
z5QJJf;fyom)p!V<cRZ>fPFh&?basjuafWF1NUq^)qBlEhMfL~agN`2_%?>hgzOf+b
z35Y3RW|7e|GBfh3xQtDJ?4a`+6~t&VP>7($;12GI;K8V-iWARg3y{$XIGQ}*1S(Fe
zjT17y%8V7+`J`bF{w(BkXBb>*2~hIM(m&LD;g4Q#6Cl0b`dx@yN|0Pe8-W-Etu$f4
zEC^W$%>>OB1bnWEIV(PVpf)@>SsyN-yzDDjk+C8_Xlsic%V)r(hqK7$Ss7VbSqIAO
z_NuC?H}==r?G<)=5_*4BYY7o2DsbLxYK|$<g(OrfP-4u{=jI?cB>@weoB|u(7|}ik
zoV>}iX8H0gt|JL)8E)Nm>oK+rjrCjBujh~Rz$Qwvc1G5LgZq|e5begSQXv7Kt0oGz
zMA#C}SdFs)@hVk3&X^jIDP1^$Z{CEsfw(wFK|TRuBuq>dLWfMiy(VKtMn3$J!n(Va
z>nO3U&mTd!WowX@9wwiZ$I1f-4z7e>X00sDKtMnj`Wyj@;j|f@sX+IOR0%zi)8Ug)
z65%f3L@&-rlCN?l4dazUFlJ_Dcb}3R@_h+UqFJB4K7Y#=3ocs+F9k9v_=B7)UqATz
zKI|kbD+7#Sm>pogg*MwswfZd-m`f4ipmE^OK&K>8WUK<pj^R?CzmdK%(YA#)b-?Fd
zk&%)4!G~a^LKD=AL|dPo4aT)=x8g#i1t7K16Y}Yjzhzba2Bg!>l?M(UJh&GX2aHH}
zbjr!9M~x8>CU3n(WsnADyXebv5|Jxi4umvLS)kXXK3t!ZfR19kF5Kr{o{_!W0zCL*
zPxnz7l9;w+XRg|688HgBt_3O|fXvU{lAWKu;dL+`1Rycuj5AG_4cv@Qs?}s#%99jE
zCIqw@4P-TnjtP@pIx7HYL}xahsRN>W1tg#Z*#jYaKHy#l>uv>IcINW@5s0+1#j<t_
zE^E1z1i6YczD~AYjxvpNbynm+JsH=AK1?n#)QrbZilEs)8gW3Q$tB6*rD(~=XAHO>
zLqulRa3K-dt$-vD8joLn_2ZTr3tfYwz*0a;t|cjnGJn;oY|aR4XDwezr%1`x2@&xE
zC2)ga6I?F%psN=72(34!+Xh&=)(IhTmePP$n7UoVIF%5NN<ov!g(S@G4=n^KnfS^%
zS3PZcwg8CF)&TU`nt~cEuPp#1Fafv~fBD(_$kqoBuFT3X8}LC4wO*J<K}U*ec%0Nl
z!n|l@5#ZE~A-s`ykaTDOHb>hwPRt-^P<6B96bVQODIwNa=FFM%tfi*rSzIjm17MA%
z0Ap>zS{hqn@Kq3Ulf-ynd4}LckZSeTY6r3pomT?^AZ-*pt6^RuGz(7LgAr+m^J2n?
zsrESO5nqN$UIQJoGA)#TXdK-t%UCeys%u-pC=X6sQ$vXP1^FD&j*iS;W0n{XmQEFV
zMFYNECOBO@PEekyv!J3^3s67;7=K7R$naKFaud1=e6LG5(`TAK_hYCR+1ah#lz=c=
zDPEx2<8$UbZE0=A5)DghO%1M+j`;-zmbJWTJcfSkZ4P<hz;w);M11-OwFIk;W><oC
zk`^bZ5IxnH$WUf9CppaVT0{;3<D+=F3qQk$?4o<_<Js`ZY)kj454o5}AtW5{>Z|7b
z8alov>)6UQMa;kx3lKv#>UNrsb$oLC&$6-0s4r-X$PpYcsl!QC#-KtM3C+-#2?D0p
zRAcBP9GDsUqAH<qqs16^;!2+Cb(dFWqxfbQP>c5AsSkJ%zg943&ef0(<9}X*f)JF}
zECmP?j>uabY8$;BZxQ5y0|$=L?vfGMRFJ6|v*A=8g2y2^Xp7zfWpVlzNe7cyY=S2s
zVj`{>FM-o8;gRmS9(Tct?5u36+uiSNMbuzCKIf{(TU%eVw7$jxfq0ZGpP!viB3mlm
zWNQpKWgTZMD|6BAz62wY!QM`=$t4D#v(xliKxa#z%IrXbLMK6GMmwR;uIcOkK3_pL
zIpqhI{4Hy_kpG6L=K7J8q$f#fv7jgsqph;OzH+VEyvbTsUS9r3QnBm}{DKan9F+zo
z#Nnv5I^mX12W%}ECaDOq+Uj!PgD(U$w5D>6kREsT&-X|-_^xyVzGv(yScTe#B1dT)
zrk=yC`x?X~%-32iM=dqBokC435Uadi_~oj{vR7o8ch21LIuN;~u{S?5WFk6OM>XmR
zl%i=rij3BPZ<Qh|IxxpU$7rTr0)Hm$INdG5$;0nXUPGVt<14=&)RBC$HKO`jaB(~m
zk(6vj0F~{itg%#jtL)y&{8ia#I|}gaf7{OAB@KQ1=i?+a-VoAR3qTsyBqz0sChEM^
zdUYheQy3Yp#+Pl9aI#`Xkm3yYA|O2t^u6+S`fhpwk`GM%G=$@q)}wT>9IZK8Q)Ar$
zTUXklV`V{&$Jg9WUt?%UP8|NRKsSA$03q@5wF)y>*xFHz(|AcqlM}U(;e!LI)L<BA
z9y1CWkmYWe8>1cH^=>V&oCkM&@BQ~a7(R|3ZLP7sNIF)5(Mw-kr=J0MJ<BeyAF)G#
zQ5iwXfr$Z$lp_f0$SAsmM}|k@ic7dEX<~Mk_uV-+Ioad!@MDT?t*y__nR5-kW8RG4
zp>*O?Sb21|`QEctw$|8pf)PIjkbbCupL>l&477odz6nQgh!kOmby~vtQ5ca?>PXd~
zke7#F-aO*HonZw^;zv<1x3{L%(<Xjz*6izA@WYHY{NxCC__>D&fyI^+Vp*A8tf<~&
zcl+q4!#<D4y=*ihaxP4b*(=Ol>!4yt3X+IXQPFCyBj;S^cdO4I_4dZa>;mK(DES_K
zP1e~tYxZn>alR2~^n;mB+~UVae92z6L-bZxm3!K_iXQx`X1FiP#}F}lMWut8Q2-5K
zj11>GMr#16B16--us6^=Q@w2BV){LlC!w6!E;h`XHAifQawHypR?ygquZZK<6P@iX
z-m+5Pu>*f7_tN*|ydVtmg__Pv!z9TWtqGBllSw@q(He~kcN{S+d=h1Y=JIJv&rq<3
z)TJ-*;757*ruST!8oztPuP-}6+}tj<H{<7+d{x{DV;?v`jQBb1%w_J-ZB>sKpG%<&
z(-9O|o9;BaNP<*@^78Po@NrI;4S@|`qHhp_NfghUHLF1sKW+yhEX*$?Z~Mo%alzPi
z2X}$7U3AYF!_LF^Sc$l?CPha}GDd|%&1en5ssZWqs>8xBKdacLeTyF7nkz23=%S0i
zb4rAsG=N4o@PUu{dPiAlhxi987~zniMU+YLl7SzSeq2Xl<X5$t+|uW-N0d*j7!G^q
z;zgHSa!E$UC6}y#kYYDsNvyb)p((P(Bb25lCPA}08p1_Is&UH!iIf~u9qtW$=~joI
ze+FX=!=uG+0+dH9@sZ`FK}+r30Nr0^#Wz=cZD-U_+P6P;a#UDkR5Vf}x448EsRpAu
zk}{7wQgv1ae+-B?i9?r+jQ84zs~cPxfTN4p)^0~+i&BpxQH*~(O%oMKjAULCkVv5<
zMUPIcB1r!-b@)9Kvk9L4B}e3EazL3s;O~;{D{BczeEn$WV2?9C9e=b!qmI0=K1!pB
zj#dLPia6!`7^%}~)I5j#%hl?c6Qt}OVk9X;e1=!IuWABt(o?*#sMF1NMa4l!NEk(~
z8KevgM|i8{kn!H7)-9We`}7QBgqk6~@%MRI=^4LRAis%v-CgRa3kM>n=rkIX>qv-6
zsIrt2<g(x!p5U(xrw)V6$O!e_rLxjsLmS+Ei2HJHS8Q}tbA42tP7Rw!MNXcATF5EM
zB{4|JMH73+y(f+}H8u5#mBdJAE@)(jIC7w_Y{JIACp!A_z>lMhBx6)$bX;5<pkzp1
z5F^zI>S+`C8Y!JD-ea$_@7c4*ZeGPP5!bDu7*CeHIKj9^Zj2WH9u>n)4a$@hV&n;(
zyb{F_N@~=)GiS&qLflhTWv{E-vj^8IU}j|0ghC7iN+)P+zfKdkEKnb#;WDB#OEDTX
zYE5KxB=u-=c!#UiI!*bR!i5y9s{>~p2DAjF&D0heF<_sdv6pJ%V*3J%rc6QF;k}vh
zCNQc|cqT`aTXG>Ur|PZKRSbPwaf~DPN^sI`5VOiYj*}cOeUbb5z+v2V{ovt1;GwaM
zU$4={)d$3wn91S1eT)iMr>7w&M$=G-bI9=UdM_FbwQAb9jGxrK`6dZiRrluGZ_`p;
zoqbQ$o~mP^DPMe%NA{ibZ+!Uh_4DTc_k;5uJiSwG*6r3!3j}_Wk^;eEro>FfWX71T
zBY%w1Ab5BVf=7zY6y54+AyOSzm1E(C3;E`o98>bokguwG@xLBE{P#PrpMT>G^XAQ;
zKMyzaM(faY^YMFiUjznjN{K<*j=|uJX~akY9<7pvJU<|+)v-&}>iW=5d5lYk8z{-g
z+gPltqF@iDWYhQO&%a?l6y!JaIp#y7+(;Z~Hlorsrx?K)1;jY2+v!H0dM=1FN)a9j
zA(I1L(@+cR%PU6hVraED$VgEwk2euQRaLvkf_(U$!+-n1ym>duc#@1z@-&b1-+UVm
za<?%B1tumA7xKy}I-1->MjMSrvO4wSk?7I-ma3<PRuQ}DwaWr>FuNQ)NJdq*rlGeY
zFTFD#gN#eJ^KZDG-(md+r#<tIn}OYBOr1iEDRC)r;bD}>vBn`&p{QEQL6PVuypv;3
zcj;mK>?IyPF8kgxe$NGkj;9s9F97#n5*}<F^hO{a9=1QeSYf12rXqF0WKbb_$4v<f
zi;9U-a~&fQJrq7jLn;LL`OvT{NnJi}Rr~}Vh;Xi&HG5Xlu3fu{6WP3~YGlLo)1N;0
zL-0vL!q$?8r0Sic2?I@O^xA>+^!p~GuB2d0fvsbrQ4uLI5@Z_kIdvI;MEt{bb<@U`
zGH?t`_VQV?=PXTHx@*@iR2|CYBMyC-;P{2ZaYh21cl~KW9XMXW<E?4o{S`4ND@J1q
z+%h~m1x(bR!P@HdCFx*9KTc`=E`Fq@`|b@DrV_~~b#<4`nw`9B_m0()ly!B(PZ{+E
zehNlOMu}141>)$C9(-p5x2E?liiwPzk_t%fmQ#?yiIIkG$*meq92nyOI?<_DFHBut
zwX1437ZOo^a`0$@zmgjw*W4g!Nddzzu=D85IP{{5^yB{M3*e3j<Cv%@H9{v^n!J*b
zV2?yHkHf41DV=xZLoW@r)HrMQRlUcK!OlEz?4JyK;$fm2K0rv<>kkck(x}BR(whR!
zXu+e5#xx^U?37d(n{=ci0}I1b0jN`_fl@u(Xrp#CxZ2-y-R#-dNvkKnIN3YGGY<cB
z{td$*DJzn}=Z#sY<z4pPj?{JE1<{wsKt>H1r=+A9$pI<-a7aW@l*S0kg+@S*A28Ty
z`<4Ix$bbCDcN+(hM=t!8B)mZylEtw;@0P!eeAdXdCd$eeq^K)m(jg=1xF8kXt_IUs
zYR8dy5Y|!AacOC~rjCl+jb~EwmybO9$Ts{v6Jnwj`0o+6hNM3$D}7}o(^zZXxC<8j
zBqhzbC_E}9YD#Kq8lnWJA<5u?)M%!__L{Wxn@$7*yVKO6iy`*?-ZptW^2}IAqHR)C
z%O3f|2OmE0$1;1U=MHUOWYqW;-DJGEnRjOkQd6NLHD@s(RP$h&0!(B2t$=Jw*W5Go
z%F#>x+qOUV+;iKvZ{N1<(e}{~%Ikf9?>qe9Lx<iueE2WCG`~?+IxOr%yy%3^80$~b
z={j1F$D?9UT*%gtE>05}J53#@)BR{sOkAuQQvM!Ad3Rdqxy}E1?s*!Z+_vpEAr3cs
z^T3Fh8vUreew$HOal)uO6gVW=dT~0YHnCBfDKz;yp^4KO)5M!n;&joP3jW5A-=Pa-
z@8595=bs1T_NPJ|?p!uE>C!a*Ln#Zo0`(}_Q&Liwq-%8d)<>g%L`NYuX>@7ECW5Sp
z)yS!*??i}n`&*e2kdOZATwp@HrfIjaB5?nLJJ5}TF(n1%Pp9$s#YV>&Z_=oJfeK?<
z+U~${<4ud2b+Kp2kN-Qwxb1}y$2*tJeYfiR`W7ren*1>_rrxnTO?O)$@Bm~)YX+;{
zo0gsy2pnHvyxV`DCX|(>BY!xIvHe_NLcFF4GBz(>3|G4_GBqV-@heT~I>;r0F+E*<
zA6|7w8fsDC(}k(K11Ekoenats1c{*eb%?{A%jUjY7a{E}-i_Bzj!sEUUGiD4k-!3r
zh><2_lojdWFYZW(ieDV3Eult_#JGL?Q$3-cat_;ne=}l#@#4?Wz(z->E=Yx6^5{ho
zk4s&g&Kc3g(Vho(6Xf`#{{>{n?c076s?3c4>aidFj1u$lB_IoQM8~D3FNRg+akJ5w
zzC>aSZaQ(t1Hr|R_g{Yarw>D&DGT|c@gC^oZSL+RWWYmeBTPLs6=>3>r=P$(7&(R>
zAG!T&UhCyD1|En`O-~>0ZHtWQlG(rJ<4<JwuPpf+J#A6+NJLC`(kD`<CUS_c`ka9!
zD8neky12!oLgL=^ue$Gl*6UyX9pBUOxYK0o8^!$3I^tRH=Zia}FsO*5O#ST~L9j(S
zO4Q%#(Pg~*Tg^vsuf&Z!-|=k(zWv^BBh?6|&(cD)ts|cGuU)zSw4(Q~<r(AXUEhAh
VF{qVIiUNuPiUNuP|1T@>e*pxry|DlQ

literal 0
HcmV?d00001

diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
index b67757a95..ecd6d5b7f 100644
--- a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
+++ b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
@@ -33,6 +33,8 @@ SetCompressor lzma
 !define MUI_LICENSEPAGE_BUTTON $(^NextBtn)
 !define MUI_LICENSEPAGE_TEXT_BOTTOM "You are now aware of your rights. Click Next to continue."
 
+!define MUI_WELCOMEFINISHPAGE_BITMAP "InstallerBackground.bmp"
+
 ; Welcome page
 !insertmacro MUI_PAGE_WELCOME
 ; License page
@@ -106,10 +108,11 @@ Function .onInit
 
  ;Run the uninstaller
   uninst:
+   CopyFiles /SILENT /FILESONLY "$INSTDIR\uninst.exe" "$TEMP\uninstallhb.exe"
    IfSilent +3
-   ExecWait $INSTDIR\uninst.exe
+   ExecWait '"$TEMP\uninstallhb.exe" _?=$INSTDIR'
    goto done
-   ExecWait '"$INSTDIR\uninst.exe" /S'
+   ExecWait '"$TEMP\uninstallhb.exe" _?=$INSTDIR /S'
   done:
 FunctionEnd
 
diff --git a/win/CS/build.xml b/win/CS/build.xml
index 92f199c29..716d17c2d 100644
--- a/win/CS/build.xml
+++ b/win/CS/build.xml
@@ -59,6 +59,7 @@
   <!-- Post Build Events -->
   <Target Name="NightlyPostBuild">
     <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\MakeNightly64.nsi $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />
+    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\InstallerBackground.bmp $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />
     <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\handbrakepineapple.ico $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />
     <Exec Command="xcopy $(MSBuildProjectDirectory)\doc $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\doc /I /Y" />
     <Exec Command="makensis $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\MakeNightly64.nsi" />
@@ -67,6 +68,7 @@
 
   <Target Name="ReleasePostBuild">
     <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\Installer64.nsi $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />
+    <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\Installer\InstallerBackground.bmp $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />
     <Exec Command="copy $(MSBuildProjectDirectory)\HandBrakeWPF\handbrakepineapple.ico $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release /Y" />
     <Exec Command="xcopy $(MSBuildProjectDirectory)\doc $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\doc /I /Y" />
     <Exec Command="makensis $(MSBuildProjectDirectory)\HandBrakeWPF\bin\x64\Release\Installer64.nsi" />
-- 
2.40.0