Merge pull request #50 from UrbanCohortDev/master

Fix call to TAbstractMem.CheckConsistency

src/config.inc

@@ -68,7 +68,7 @@
   {$DEFINE USE_ABSTRACTMEM}
 
   // Activate GNUGETTEXT library
-  {.$DEFINE USE_GNUGETTEXT}
+  {$DEFINE USE_GNUGETTEXT}
   
   // Activate usage of TPCTemporalFileStream instead of TBytes in order to minimize mem usage
   // This also fixes issue #207 High memory usage on FreePascal compiler

src/core/UPCRPCFileUtils.pas

@@ -101,7 +101,7 @@ begin
     if AInputParams.GetAsVariant('report').AsBoolean(False) then LReport := LStrings
     else LReport := Nil;
     Lobj := AJSONResponse.GetAsObject('result').GetAsObject('abstractmem');
-    if TNode.Node.Bank.SafeBox.PCAbstractMem.AbstractMem.CheckConsistency(LReport, LTotalUsedSize, LTotalUsedBlocksCount, LTotalLeaksSize, LTotalLeaksBlocksCount) then begin
+    if TNode.Node.Bank.SafeBox.PCAbstractMem.AbstractMem.CheckConsistency(LReport, Nil, LTotalUsedSize, LTotalUsedBlocksCount, LTotalLeaksSize, LTotalLeaksBlocksCount) then begin
       Lobj.GetAsVariant('checkconsistency').Value := True;
     end else begin
       Lobj.GetAsVariant('checkconsistency').Value := False;
@@ -121,6 +121,7 @@ begin
         dec(nMax);
       end;
     end;
+
     Result := True;
   Finally
     LStrings.Free;

src/gui-classic/UFRMPascalCoinWalletConfig.pas

@@ -94,6 +94,8 @@ type
     Property WalletKeys : TWalletKeys read FWalletKeys write SetWalletKeys;
   end;
 
+  {$I ../config.inc}
+
 implementation
 
 uses

src/gui-classic/UFRMWallet.pas

@@ -1373,7 +1373,7 @@ begin
   {$IFDEF USE_GNUGETTEXT}
   // use language from the params and retranslate if needed
   // might be better to move this a bit earlier in the formcreate routine
-  UseLanguage(FAppParams.ParamByName[CT_PARAM_UILanguage].GetAsString(GetCurrentLanguage));
+  UseLanguage(TSettings.AppParams.ParamByName[CT_PARAM_UILanguage].GetAsString(GetCurrentLanguage));
   RetranslateComponent(self);
   {$ENDIF}
   //