opensource/HeidiSQL
1
0
Fork 0
mirror of https://github.com/HeidiSQL/HeidiSQL.git synced 2025-08-06 18:24:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Load libpq.dll with full path, so the LoadLibrary does not accidentally take a different (probably wrong) one from somewhere else than the current directory. See http://www.heidisql.com/forum.php?t=21039

Browse Source
This commit is contained in:
Ansgar Becker
2016-04-04 18:18:59 +00:00
parent bd63325a9f
commit bdddc726b4
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/dbconnection.pas
View File

@ -2090,12 +2090,15 @@ end;
procedure TPgConnection.DoBeforeConnect; procedure TPgConnection.DoBeforeConnect;
var
LibWithPath: String;
begin begin
// Init lib before actually connecting. // Init lib before actually connecting.
// Each connection has its own library handle // Each connection has its own library handle
if LibPqHandle = 0 then begin if LibPqHandle = 0 then begin
Log(lcDebug, f_('Loading library file %s ...', [LibPqPath])); LibWithPath := ExtractFileDir(Application.ExeName) + '\' + LibPqPath;
LibPqHandle := LoadLibrary(PWideChar(LibPqPath)); Log(lcDebug, f_('Loading library file %s ...', [LibWithPath]));
LibPqHandle := LoadLibrary(PWideChar(LibWithPath));
if LibPqHandle = 0 then if LibPqHandle = 0 then
raise EDatabaseError.CreateFmt(_('Cannot find a usable %s. Please launch %s from the directory where you have installed it.'), [LibPqPath, ExtractFileName(ParamStr(0))]) raise EDatabaseError.CreateFmt(_('Cannot find a usable %s. Please launch %s from the directory where you have installed it.'), [LibPqPath, ExtractFileName(ParamStr(0))])
else begin else begin