From e2231d1ff235a4d8528fd753ddb8744b0e777f1a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Uwe=20St=C3=B6hr?= <uwestoehr@web.de>
Date: Mon, 21 May 2007 23:01:30 +0000
Subject: [PATCH] installer: - Launcher: set default working directory when
 starting LyX   (thanks again to Martin Rauscher for testing)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18447 a592a061-630c-0410-9148-cb99ea01b6c8
---
 .../specials/Launcher/lyxLauncher.dof         |   2 +-
 .../specials/Launcher/lyxLauncher.dpr         |  12 +++++++++---
 .../specials/Launcher/lyxLauncher.exe         | Bin 406016 -> 406016 bytes
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.dof b/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.dof
index 11ae329775..c59ac4ca8f 100644
--- a/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.dof
+++ b/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.dof
@@ -95,7 +95,7 @@ UnitOutputDir=
 PackageDLLOutputDir=
 PackageDCPOutputDir=
 SearchPath=
-Packages=vcl;rtl;vclx;dbrtl;vcldb;bdertl;vclshlctrls;vclactnband;adortl;vcldbx;VclSmp;visualclx;visualdbclx;dbexpress;vclie;xmlrtl;inetdbbde;inet;inetdbxpress;teeui;teedb;tee;Rave50CLX;Rave50VCL;IntrawebDB_50_70;Intraweb_50_70;indy;ibxpress;dsnap;soaprtl;dbxcds;inetdb
+Packages=vcl;rtl;vclx;vclshlctrls;vclactnband;dbrtl;adortl;vcldb;bdertl;vcldbx;VclSmp;visualclx;visualdbclx;dsnap;inet;inetdb;ibxpress;indy;vclie;IntrawebDB_50_70;Intraweb_50_70;Rave50CLX;Rave50VCL;teeui;teedb;tee;xmlrtl;soaprtl;dbexpress;dbxcds
 Conditionals=
 DebugSourceDirs=
 UsePackages=0
diff --git a/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.dpr b/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.dpr
index 4a5bef8535..d38706cfd1 100644
--- a/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.dpr
+++ b/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.dpr
@@ -23,17 +23,23 @@ procedure StartLyX(hConsole: THandle; FileName,Path: string);
 
 var Params : PChar;
     hLyX : THandle;
+    Folder : string;
 begin
 
- // if a filename is given, convert it to a PChar; needed for the ShellExecute
+ // if a filename is given, quote it to avoid the path with spaces problem
  if FileName <> '' then
   Params:= PChar('"' + FileName + '"')
  else
   Params:= nil;
 
+ // get folder of the lyx.exe
+ Folder:= StringReplace(Path,'\lyx.exe','',[rfIgnoreCase]);
+ // quote path to avoid the path with spaces problem
+ Folder:= '"' + Folder + '"';
+ 
  // start LyX
- hLyX:= ShellExecute(hConsole,PChar('open'),
-                     PChar(Path),Params,nil,SW_SHOWNORMAL);
+ hLyX:= ShellExecute(hConsole,PChar('open'),PChar(Path),
+                     Params,PChar(Folder),SW_SHOWNORMAL);
  if hLyX = ERROR_FILE_NOT_FOUND  then
  begin
   MessageDLG('The file'#13#10 + Path + #13#10
diff --git a/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.exe b/development/Win32/packaging/AltInstaller/specials/Launcher/lyxLauncher.exe
index fe30a6fb9be346727953565ed33c0e1dd795427d..46791d0c5ff16c3d59a9abe8b915bf860debced7 100644
GIT binary patch
delta 1802
zcmZvce`p(J7{~9fdzWo6GO)F$RhO<)rqEgPj!_5ZR6OcGb%B|#UDxiPRzet#L8}qb
z6pPGqlvN9+1ECvpn~Y?Q^+&QWF_Jkdi2Y}UV3onB?5z!33Kfps!Rzx}V)qi>3wQ5x
z@B4Ya&-b49E@LbD*ovOnr>YCn&#ND3Q^!ARZJGXAHPqYFs`fyg8eiAWtZOQqI5xn!
zCA+SXul$Laa-?UX+n$KHR>d-1Hv6o@Ez@R67-=CAy|LR=hIq%&L}2_wR~dOOdK)JA
zsOycBW+mUCC<=RNFJ@KPY0NIIX>|E~3Apg2xe=zn=2sv_(H&nqye6<w6-byHRRz1v
z;W5=RH`spA2p>UwFGkS{B=@jSzjOGwt&JXtDN!YW7VKyvjL`sGCe3nw3;LJ`70WEY
zZS6b&)AK6pb~#_$H*S;BwisZ{>bCQ*z!GcpNOtTI+6E{s9P8^Fn%EUBLQ%l;TTxXF
zIJ~&J{Di~T)&~2nzXysi%i&OA+ykdpyWa-m@ssbz_YcR1mE^g{$j6B#sDpj{5sFs(
z7-i5hcKr%Eb=fbl9*#i=Uw8N?g^{~4CCt)Ym{W6d(|bOb{rL=<_(KO1mA--ERKzNy
z?!8Uj&5ZjnRb0&=Y5N9>hrpDbz0gP&;q^$Kew^ru3J~npp{ldlw*Q^w?S50C1-7yk
zwkZYE;A`Pk+);Q-Sjcqv1teH!Yt?gVb8Qc-ozFl9?07kR{RTw&1-MlC!bQ-ClyhG4
z*{7U0dENz`9JY_ep_sK3m#ik7wTf)J!)uk6#XY$Uf*{WxwqPghChSB%bDvE1G?T&X
zHl6%tsqyU6MG{flzYpCC{T{j>dKmH<e&e9=h7mR*#!2Ih@r7~KPy$5Jq569rnU2Md
zyUF&eq$^ptMBYt)d5*l$dNa5b{44lR@ZX?Hn<=F))7NMheTxp#cjyQmqn~GwUM81F
zgJ1h0=}VD_7o12D(+jSo$gmgq)1=)Cj5KNTf}?3N=>_-F<Y_PPU8`jszDAl_K=2^+
z1P&E`in7b6jNu&?O4I|m(CNc#6_}F&y#jDY2E+xxKUe1grDp`dkO4UXI3)v00x&BB
zYynu50XlwIa9|&}4CoYq7c+HF;e)@1UI92E1L6X3wjRLRGXn6F49E$<0~t^ffZgBJ
znZy#d034P9`gX)>?}H5J6o5Gy&?^9UWI$X1{PPl%GXh}9fSdrFk^v<Fn3Vyx04&M?
TeaE9dZ~*XA$~J#XRzLa=B4s1m

delta 1709
zcmZvbZAep57{||@o@Os*l;+gJi4_ICjC&)bXg8t@fxV2%($Xxjy6r<5%@Crt7*T7j
zH=%10m0+*9EGxG5rNyKVA^273gHb_eI7+GD(jDBMb7yuKXXBpp?0J6A|9Rmq@YNCc
z>Uh3X5PV(BgwwW*&DU$Hy50%05a<$YKZJ|H3EPDUn*a~J3*ae?P1ta6iKflPv;94b
z4Ku9h<QCjgvOx`0E2zzMwS}C)Gg;(YqIQGB?8sVoMER8{KnRg_i)hv_a*}3`jM=1*
zUcrlYQlSIj@~C$pYd0BuWtc(T*0I`))ILi`SCeq7LvTct@kHT4s`kB>s*N8G7k>i(
zfIvc7(;QnG)Nx0x7r0D#tDeX}h<GeA^Pg-5QcCV^YHAD3Q7>4knFOYy>z#&~N|#q^
zZ|C6(ZG0Z~`<Fr2bjG93e>18C#v#RzY5gpzfVjttNMw^?o=^Hddy$6-n`zEufp$oY
z0O+cw+AAvzb8Nh+C3USKoT0j1Q@T?bx51T47gAEUx1`oWXT7oCrFdBI`yd2~!NJT<
zDH&2SJ)IjA^d1TEI}jk1>vFx;*Z%7@q3=_Wlq7X_!&Do=4V^C7NcRt$CpQ$s?4bm?
zT$7suO~p<@?0z$3cwm>FH!4^O-w`--38lRt(vXQ;*<ThIW+DqZae;1eXd1+dX(U`m
zz2OvTG0e$IAKB&a06mZ=+dv?d-ZG!=W*_lXX-~`Xer-cN-W4ly;GwXsUC<Iw@Fnd)
zFaEIjrF+ml<o@HHC6~$-vP-U)_sYj)<iyAU^=n<tuG6k7+RUf;gm(7<K2_5$o)bgj
zO|eIeiYakaOpD*epCXcGNR^UPS}wU`tq<`7eBD)4@Ot2tX79rdmeJaW70Y<khYwjs
zNffWJ3^|I+EMrd;M=ax86fd+4`?JZc?ay#o6$q|@oxn$cFG6$dC_sPFLjHV!2I}ne
z%mMv8ppgMac|a!vl=SEIK&87GK;{8)1~|?GMi}5856~H4m<KqDXeYTbO&(Ck0IQzo
zO<^xYsF49$c|a!vT+Ih)?QRBm%LC#J@Ph}8FhKQ-ye4T0odLG<0LOHSO}-C2ppF6h
zc|aorjPig^1}GWeG}+AnG7pF|z;PZh!T|SpfX)EJJisyI{~k;L=wB&T{t~Cp{slr`
BJSYGF

-- 
2.39.2