FIX: Double plugin initialization (issue #2616)

(cherry picked from commit 2688fd8499)
This commit is contained in:
Alexander Koblov 2025-12-02 18:14:43 +03:00
commit 3d7c4206d1
2 changed files with 2 additions and 1 deletions

View file

@ -660,7 +660,7 @@ begin
begin
if FSearchTemplate.IsFindText and (gWCXPlugins.Flags[Index] and PK_CAPS_SEARCHTEXT = 0) then
Continue;
WcxModule:= gWCXPlugins.LoadModule(GetCmdDirFromEnvVar(gWCXPlugins.FileName[Index]));
WcxModule:= gWCXPlugins.LoadModule(gWCXPlugins.FileName[Index]);
Break;
end;
end;

View file

@ -404,6 +404,7 @@ var
StartupInfo: TExtensionStartupInfo;
PackDefaultParamStruct : TPackDefaultParamStruct;
begin
if FModuleHandle <> 0 then Exit(True);
FModuleName := ExtractFileName(sName);
FModulePath := mbExpandFileName(sName);
FModuleHandle := mbLoadLibrary(FModulePath);