Fix soup & WQK operations on start

This commit is contained in:
Stas Degteff 2011-02-22 11:27:21 +00:00
parent acd96d47bc
commit 177bd5183a

View File

@ -936,25 +936,28 @@ int ReadCfg(const char* cfgfile, int ignoreunknown)
if (inuse == 0) if (inuse == 0)
{ {
// Mark all areas listed in the NEWSRC file as newsgroups // Mark all areas listed in the NEWSRC file as newsgroups
gfile gfp(CFG->soupnewsrcfile, "rt"); if (*CFG->soupnewsrcfile)
if (gfp.isopen())
{ {
char buf2[512]; gfile gfp(CFG->soupnewsrcfile, "rt");
while (gfp.Fgets(buf2, sizeof(buf2))) if (gfp.isopen())
{ {
char* ptr = strpbrk(buf2, ":! "); char buf2[512];
if(ptr) { while (gfp.Fgets(buf2, sizeof(buf2)))
*ptr = NUL; {
Area* ap = AL.AreaEchoToPtr(buf2); char* ptr = strpbrk(buf2, ":! ");
if(ap) if(ptr) {
ap->set_type(ap->isnet() ? GMB_SOUP|GMB_EMAIL|GMB_NET : GMB_SOUP|GMB_NEWSGROUP|GMB_ECHO); *ptr = NUL;
Area* ap = AL.AreaEchoToPtr(buf2);
if(ap)
ap->set_type(ap->isnet() ? GMB_SOUP|GMB_EMAIL|GMB_NET : GMB_SOUP|GMB_NEWSGROUP|GMB_ECHO);
}
} }
gfp.Fclose();
} }
gfp.Fclose();
} }
if(*CFG->soupemail) { if(*CFG->soupemail) {
Area* ap = AL.AreaEchoToPtr(buf); Area* ap = AL.AreaEchoToPtr(CFG->soupemail);
if(ap) if(ap)
ap->set_type(GMB_SOUP|GMB_EMAIL|GMB_NET); ap->set_type(GMB_SOUP|GMB_EMAIL|GMB_NET);
} }
@ -971,7 +974,7 @@ int ReadCfg(const char* cfgfile, int ignoreunknown)
do { do {
if(QWK->FirstConf()) { if(QWK->FirstConf()) {
do { do {
Area* ap = AL.AreaEchoToPtr(buf); Area* ap = AL.AreaEchoToPtr(QWK->ConfName());
if(ap) if(ap)
ap->set_type(ap->type() | GMB_QWK); ap->set_type(ap->type() | GMB_QWK);
} while(QWK->NextConf()); } while(QWK->NextConf());