Fixed issue #115:

* Added further Win10 SDK path
* Make sure an existing setting is not overriden with empty string

Author: joachimmarder

Designer/Classes/Settings.pas

@@ -102,8 +102,10 @@ procedure TSettings.DetectTools();
   BdsVersion: Integer;
   BdsKey, BdsPath: String;
 begin
-  FRibbonCompilerPath := FindTool('UICC.exe');
-  FResourceCompilerPath := FindTool('rc.exe');
+  if not FileExists(FRibbonCompilerPath) then
+    FRibbonCompilerPath := FindTool('UICC.exe');
+  if not FileExists(FResourceCompilerPath) then
+    FResourceCompilerPath := FindTool('rc.exe');
 
   // Find delphi compiler
   Reg := TRegistry.Create;
@@ -145,9 +147,9 @@ function TSettings.GetSearchPaths: string;
     lList.Delimiter := PathSep;
     lList.Add(ExtractFileDir(ParamStr(0))); // Check current directory of the RibbonCMDCompiler.exe first to find ribbon compiler UICC.exe
     lList.Add(GetEnvironmentVariable('PATH'));
+    lList.Add(GetEnvironmentVariable('ProgramFiles(x86)') + '\Windows Kits\10\bin\10.0.18362.0\x86\');
     lList.Add(GetEnvironmentVariable('ProgramFiles')      + '\Windows Kits\10\bin\x86\');
     lList.Add(GetEnvironmentVariable('ProgramFiles(x86)') + '\Windows Kits\10\bin\x86\');
-    lList.Add(GetEnvironmentVariable('ProgramFiles(x86)') + '\Windows Kits\10\bin\x86\');
     lList.Add(GetEnvironmentVariable('ProgramFiles')      + '\Windows Kits\8.1\bin\x86\');
     lList.Add(GetEnvironmentVariable('ProgramFiles(x86)') + '\Windows Kits\8.1\bin\x86\');
     lList.Add(GetEnvironmentVariable('ProgramFiles')      + '\Microsoft SDKs\Windows\v7.1\Bin\');