diff --git a/src/sbbs3/ctrl/MainFormUnit.cpp b/src/sbbs3/ctrl/MainFormUnit.cpp index a1b1bcd56ad65ed3813694fda539d75903f27716..f5548ab7e5ef3aaf98868d3e9341e38a83ad12de 100644 --- a/src/sbbs3/ctrl/MainFormUnit.cpp +++ b/src/sbbs3/ctrl/MainFormUnit.cpp @@ -3255,7 +3255,7 @@ void __fastcall TMainForm::BBSConfigWizardMenuItemClick(TObject *Sender) Application->CreateForm(__classid(TConfigWizard), &ConfigWizard); if(ConfigWizard->ShowModal()==mrOk) { SaveSettings(Sender); - ReloadConfigExecute(Sender); +// ReloadConfigExecute(Sender); /* unnecessary since refresh_cfg() is already called */ } delete ConfigWizard; @@ -3270,15 +3270,8 @@ void __fastcall TMainForm::PageControlUnDock(TObject *Sender, Allow=UndockableForms; } //--------------------------------------------------------------------------- - -void __fastcall TMainForm::ReloadConfigExecute(TObject *Sender) +void __fastcall TMainForm::reload_config(void) { - FtpRecycleExecute(Sender); - WebRecycleExecute(Sender); - MailRecycleExecute(Sender); - TelnetRecycleExecute(Sender); - ServicesRecycleExecute(Sender); - char error[256]; SAFECOPY(error,UNKNOWN_LOAD_ERROR); if(!load_cfg(&cfg, NULL, TRUE, error)) { @@ -3287,7 +3280,18 @@ void __fastcall TMainForm::ReloadConfigExecute(TObject *Sender) Application->Terminate(); } semfile_list_check(&initialized,recycle_semfiles); +} +//--------------------------------------------------------------------------- +void __fastcall TMainForm::ReloadConfigExecute(TObject *Sender) +{ + FtpRecycleExecute(Sender); + WebRecycleExecute(Sender); + MailRecycleExecute(Sender); + TelnetRecycleExecute(Sender); + ServicesRecycleExecute(Sender); + + reload_config(); #if 0 /* This appears to be redundant */ node_t node; for(int i=0;i<cfg.sys_nodes;i++) { @@ -3699,9 +3703,6 @@ void __fastcall TMainForm::ViewFile(AnsiString filename, AnsiString Caption) } } //--------------------------------------------------------------------------- - - - void __fastcall TMainForm::SemFileTimerTick(TObject *Sender) { char* p; @@ -3713,7 +3714,7 @@ void __fastcall TMainForm::SemFileTimerTick(TObject *Sender) } else if((p=semfile_list_check(&initialized,recycle_semfiles))!=NULL) { StatusBar->Panels->Items[4]->Text=AnsiString(p) + " signaled"; - ReloadConfigExecute(Sender); + reload_config(); } } //--------------------------------------------------------------------------- diff --git a/src/sbbs3/ctrl/MainFormUnit.h b/src/sbbs3/ctrl/MainFormUnit.h index a5be4e304df27aaccc399d9f314874a99bafa599..24bcc5a1071b04ec7f024fa9d346bd02b7c30595 100644 --- a/src/sbbs3/ctrl/MainFormUnit.h +++ b/src/sbbs3/ctrl/MainFormUnit.h @@ -438,6 +438,7 @@ public: // User declarations void __fastcall WriteFont(AnsiString, TFont*); void __fastcall EditFile(AnsiString filename, AnsiString Caption="Edit"); void __fastcall ViewFile(AnsiString filename, AnsiString Caption); + void __fastcall reload_config(void); BOOL __fastcall bbsServiceEnabled(void); BOOL __fastcall ftpServiceEnabled(void); BOOL __fastcall webServiceEnabled(void);