With INI file provided on command-line, using the same INI file when starting a new instance

Source commit: e81bf855631a8a489a068089fdc1453189a2d9fb

source/windows/Tools.cpp

@@ -521,6 +521,7 @@ void __fastcall ExecuteNewInstance(const UnicodeString & Param, const UnicodeStr
     Arg = FORMAT(L"\"%s\"", (Param));
   }
   UnicodeString Space(L" ");
+  AddToList(Arg, GetIniFileParam(), Space);
   AddToList(Arg, TProgramParams::FormatSwitch(NEWINSTANCE_SWICH), Space);
   AddToList(Arg, AdditionalParams, Space);
 
@@ -619,18 +620,23 @@ IShellLink * __fastcall CreateDesktopShortCut(const UnicodeString & Name,
   return pLink;
 }
 //---------------------------------------------------------------------------
-IShellLink * __fastcall CreateAppDesktopShortCut(
-  const UnicodeString & Name, const UnicodeString & AParams, const UnicodeString & Description,
-  int SpecialFolder, int IconIndex, bool Return)
+UnicodeString GetIniFileParam()
 {
   UnicodeString ParamValue = Configuration->GetIniFileParamValue();
 
-  UnicodeString Params;
+  UnicodeString Result;
   if (!ParamValue.IsEmpty())
   {
-    Params = TProgramParams::FormatSwitch(INI_SWITCH) + L"=" + AddQuotes(ParamValue);
+    Result = TProgramParams::FormatSwitch(INI_SWITCH) + L"=" + AddQuotes(ParamValue);
   }
-
+  return Result;
+}
+//---------------------------------------------------------------------------
+IShellLink * __fastcall CreateAppDesktopShortCut(
+  const UnicodeString & Name, const UnicodeString & AParams, const UnicodeString & Description,
+  int SpecialFolder, int IconIndex, bool Return)
+{
+  UnicodeString Params = GetIniFileParam();
   AddToList(Params, AParams, L" ");
 
   return CreateDesktopShortCut(Name, Application->ExeName, Params, Description, SpecialFolder, IconIndex, Return);

source/windows/Tools.h

@@ -20,6 +20,7 @@ bool __fastcall UseAlternativeFunction();
 bool __fastcall OpenInNewWindow();
 void ExecuteSelf(const UnicodeString & Params);
 void __fastcall ExecuteNewInstance(const UnicodeString & Param, const UnicodeString & AdditionalParams = UnicodeString());
+UnicodeString GetIniFileParam();
 IShellLink * __fastcall CreateAppDesktopShortCut(
   const UnicodeString & Name, const UnicodeString & Params, const UnicodeString & Description,
   int SpecialFolder = -1, int IconIndex = 0, bool Return = false);