nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

corrected template cleanup (previous commit)

Browse Source
This commit is contained in:
john30
2015-11-22 10:39:34 +01:00
parent 89d8167580
commit f08071a52e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/main.cpp
+2
View File
@@ -460,6 +460,7 @@ void shutdown()
for (map<string, DataFieldTemplates*>::iterator it = templatesByPath.begin(); it != templatesByPath.end(); it++) { for (map<string, DataFieldTemplates*>::iterator it = templatesByPath.begin(); it != templatesByPath.end(); it++) {
if (it->second!=&globalTemplates) if (it->second!=&globalTemplates)
delete it->second; delete it->second;
it->second = NULL;
} }
templatesByPath.clear(); templatesByPath.clear();
@@ -641,6 +642,7 @@ result_t loadConfigFiles(MessageMap* messages, bool verbose)
messages->clear(); messages->clear();
globalTemplates.clear(); globalTemplates.clear();
for (map<string, DataFieldTemplates*>::iterator it = templatesByPath.begin(); it != templatesByPath.end(); it++) { for (map<string, DataFieldTemplates*>::iterator it = templatesByPath.begin(); it != templatesByPath.end(); it++) {
if (it->second!=&globalTemplates)
delete it->second; delete it->second;
it->second = NULL; it->second = NULL;
} }