--- sbbs/src/sbbs3/ctrl/configwizardunit.cpp 2018/04/24 16:41:24 1.1.1.1 +++ sbbs/src/sbbs3/ctrl/configwizardunit.cpp 2018/04/24 16:44:26 1.1.1.2 @@ -1,12 +1,12 @@ /* Synchronet Control Panel (GUI Borland C++ Builder Project for Win32) */ -/* $Id: configwizardunit.cpp,v 1.1.1.1 2018/04/24 16:41:24 root Exp $ */ +/* $Id: configwizardunit.cpp,v 1.1.1.2 2018/04/24 16:44:26 root Exp $ */ /**************************************************************************** * @format.tab-size 4 (Plain Text/Source Code File Header) * * @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) * * * - * Copyright 2005 Rob Swindell - http://www.synchro.net/copyright.html * + * Copyright 2011 Rob Swindell - http://www.synchro.net/copyright.html * * * * This program is free software; you can redistribute it and/or * * modify it under the terms of the GNU General Public License * @@ -47,7 +47,6 @@ #pragma package(smart_init) #pragma resource "*.dfm" -#define ILLEGAL_FILENAME_CHARS "\\/|<>+[]:=\";,%" #define ILLEGAL_QWKID_CHARS "*?" ILLEGAL_FILENAME_CHARS char ctrl_dir[MAX_PATH+1]; @@ -145,7 +144,7 @@ void __fastcall TConfigWizard::FormShow( char error[256]; SAFECOPY(error,UNKNOWN_LOAD_ERROR); if(!load_cfg(&scfg,NULL,FALSE,error)) { - Application->MessageBox(error,"ERROR Loadin Configuration" + Application->MessageBox(error,"ERROR Loading Configuration" ,MB_OK|MB_ICONEXCLAMATION); Close(); return; @@ -174,10 +173,21 @@ void __fastcall TConfigWizard::FormShow( break; default: scfg.sys_timezone=tz.Bias|WESTERN_ZONE; + if(tzRet==TIME_ZONE_ID_DAYLIGHT) + scfg.sys_timezone|=DAYLIGHT; + break; + } + } else if(tz.Bias<0) { + switch(tzRet) { + case TIME_ZONE_ID_DAYLIGHT: + tz.Bias += tz.DaylightBias; + break; + case TIME_ZONE_ID_STANDARD: + tz.Bias += tz.StandardBias; break; } - } else if(tz.Bias<0) scfg.sys_timezone=(-tz.Bias)|EASTERN_ZONE; + } #if 0 /* Get DNS Server Address */ str_list_t dns_list = getNameServerList();