From 603d131c1922d9fbe225f749018f4ee06bdb5a60 Mon Sep 17 00:00:00 2001 From: mattias Date: Sun, 21 May 2006 08:32:19 +0000 Subject: [PATCH] html help viewer: searching for rundll32 git-svn-id: trunk@9323 - --- lcl/lazhelphtml.pas | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/lcl/lazhelphtml.pas b/lcl/lazhelphtml.pas index 038f971018..c323dfdeef 100644 --- a/lcl/lazhelphtml.pas +++ b/lcl/lazhelphtml.pas @@ -393,7 +393,8 @@ procedure THTMLBrowserHelpViewer.FindDefaultBrowser(var Browser, Ext:=''; {$ENDIF} Filename:=SearchFileInPath(ShortFilename+Ext,'', - SysUtils.GetEnvironmentVariable('PATH'),PathSeparator,[]); + SysUtils.GetEnvironmentVariable('PATH'),PathSeparator, + [sffDontSearchInBasePath]); Result:=Filename<>''; if Result then begin FDefaultBrowser:=Filename; @@ -407,7 +408,15 @@ begin OnFindDefaultBrowser(FDefaultBrowser, FDefaultBrowserParams); end; if FDefaultBrowser='' then begin - // prefer open source ;) + {$IFDEF MSWindows} + FDefaultBrowser:= SearchFileInPath('rundll32.exe','', + SysUtils.GetEnvironmentVariable('PATH'),';', + [sffDontSearchInBasePath]); + FDefaultBrowserParams:='url.dll,FileProtocolHandler %s'; + {$ENDIF} + end; + if FDefaultBrowser='' then begin + // then search in path prefer open source ;) if Find('mozilla') or Find('galeon') or Find('konqueror')