Browse Source

move ISUPPORT regeneration to the end of config loading

tags/v1.2.0-rc1
Shivaram Lingamneni 4 years ago
parent
commit
c1acf3ea43
1 changed files with 6 additions and 5 deletions
  1. 6
    5
      irc/config.go

+ 6
- 5
irc/config.go View File

827
 
827
 
828
 	config.loadMOTD()
828
 	config.loadMOTD()
829
 
829
 
830
-	err = config.generateISupport()
831
-	if err != nil {
832
-		return nil, err
833
-	}
834
-
835
 	// in the current implementation, we disable history by creating a history buffer
830
 	// in the current implementation, we disable history by creating a history buffer
836
 	// with zero capacity. but the `enabled` config option MUST be respected regardless
831
 	// with zero capacity. but the `enabled` config option MUST be respected regardless
837
 	// of this detail
832
 	// of this detail
847
 		}
842
 		}
848
 	}
843
 	}
849
 
844
 
845
+	// now that all postprocessing is complete, regenerate ISUPPORT:
846
+	err = config.generateISupport()
847
+	if err != nil {
848
+		return nil, err
849
+	}
850
+
850
 	return config, nil
851
 	return config, nil
851
 }
852
 }

Loading…
Cancel
Save