Skip to content
Snippets Groups Projects
Commit 80b11270 authored by rswindell's avatar rswindell
Browse files

Bugfix (cause of Hostname being set to "(null)" when importing registry

settings from v3.00-v3.11): Registry->ReadString() returns an AnsiString, not
char*. (whoops)
parent 2ff55ae4
No related branches found
No related tags found
No related merge requests found
...@@ -1880,11 +1880,11 @@ void __fastcall TMainForm::StartupTimerTick(TObject *Sender) ...@@ -1880,11 +1880,11 @@ void __fastcall TMainForm::StartupTimerTick(TObject *Sender)
ServicesAutoStart=true; ServicesAutoStart=true;
if(Registry->ValueExists("Hostname")) if(Registry->ValueExists("Hostname"))
SAFECOPY(global.host_name,Registry->ReadString("Hostname")); SAFECOPY(global.host_name,Registry->ReadString("Hostname").c_str());
if(Registry->ValueExists("CtrlDirectory")) if(Registry->ValueExists("CtrlDirectory"))
SAFECOPY(global.ctrl_dir,Registry->ReadString("CtrlDirectory")); SAFECOPY(global.ctrl_dir,Registry->ReadString("CtrlDirectory").c_str());
if(Registry->ValueExists("TempDirectory")) if(Registry->ValueExists("TempDirectory"))
SAFECOPY(global.temp_dir,Registry->ReadString("TempDirectory")); SAFECOPY(global.temp_dir,Registry->ReadString("TempDirectory").c_str());
if(Registry->ValueExists("SemFileCheckFrequency")) if(Registry->ValueExists("SemFileCheckFrequency"))
global.sem_chk_freq=Registry->ReadInteger("SemFileCheckFrequency"); global.sem_chk_freq=Registry->ReadInteger("SemFileCheckFrequency");
...@@ -2078,7 +2078,7 @@ void __fastcall TMainForm::StartupTimerTick(TObject *Sender) ...@@ -2078,7 +2078,7 @@ void __fastcall TMainForm::StartupTimerTick(TObject *Sender)
if(Registry->ValueExists("ServicesOptions")) if(Registry->ValueExists("ServicesOptions"))
services_startup.options=Registry->ReadInteger("ServicesOptions"); services_startup.options=Registry->ReadInteger("ServicesOptions");
if(SaveIniSettings(Sender)) if(SaveIniSettings(Sender))
Registry->WriteBool("Imported",true); /* Use the .ini file for these settings from now on */ Registry->WriteBool("Imported",true); /* Use the .ini file for these settings from now on */
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment