Added reference counting for on request loading (Mantis 6355)

project-jedi · Dec 4, 2014 · d87ec8a · d87ec8a
1 parent 9e4ab04
commit d87ec8a
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/jvcl/run/Hid.pas b/jvcl/run/Hid.pas
@@ -2167,6 +2167,7 @@ implementation
 {$IFDEF HID_LINKONREQUEST}
 var
   HidLib: TModuleHandle = INVALID_MODULEHANDLE_VALUE;
+  HidLoadCount: Integer = 0;
 {$ENDIF HID_LINKONREQUEST}
 
 // (rom) this function is a macro and cannot be implemented with the original name
@@ -2213,6 +2214,9 @@ function IsHidLoaded: Boolean;
 function LoadHid: Boolean;
 begin
   {$IFDEF HID_LINKONREQUEST}
+  Inc(HidLoadCount);
+  if HidLoadCount > 1 then
+    Exit;
   Result := LoadModule(HidLib, HidModuleName);
   if Result then
   begin
@@ -2279,6 +2283,9 @@ function LoadHid: Boolean;
 procedure UnloadHid;
 begin
   {$IFDEF HID_LINKONREQUEST}
+  Dec(HidLoadCount);
+  if HidLoadCount > 0 then
+    Exit;
   UnloadModule(HidLib);
   @HidD_Hello := nil;
   @HidD_GetHidGuid := nil;