diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/configreader.h | 2 | ||||
| -rw-r--r-- | include/inspircd.h | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/configreader.h b/include/configreader.h index 54d9f7053..70e09e6c3 100644 --- a/include/configreader.h +++ b/include/configreader.h @@ -65,6 +65,8 @@ class CoreExport ConfigTag : public refcountbase std::string getTagLocation(); + inline const std::vector<KeyVal>& getItems() const { return items; } + /** Create a new ConfigTag, giving access to the private KeyVal item list */ static ConfigTag* create(const std::string& Tag, const std::string& file, int line, std::vector<KeyVal>*&items); diff --git a/include/inspircd.h b/include/inspircd.h index 9156d3444..292fbd488 100644 --- a/include/inspircd.h +++ b/include/inspircd.h @@ -256,16 +256,17 @@ class BanCacheManager; class CoreExport ConfigReaderThread : public Thread { ServerConfig* Config; - bool done; + volatile bool done; public: - std::string TheUserUID; + const std::string TheUserUID; ConfigReaderThread(const std::string &useruid) - : Thread(), done(false), TheUserUID(useruid) + : Config(new ServerConfig), done(false), TheUserUID(useruid) { } virtual ~ConfigReaderThread() { + delete Config; } void Run(); |