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

nicer cleanup

Browse Source
This commit is contained in:
john30
2014-12-27 13:38:05 +01:00
parent 121ad369e8
commit c8e72126c7
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ebusd/baseloop.cpp
+13 -4
View File
@@ -84,23 +84,32 @@ BaseLoop::BaseLoop()
BaseLoop::~BaseLoop() BaseLoop::~BaseLoop()
{ {
if (m_network != NULL) if (m_network != NULL) {
delete m_network; delete m_network;
m_network = NULL;
}
if (m_busHandler != NULL) { if (m_busHandler != NULL) {
m_busHandler->stop(); m_busHandler->stop();
m_busHandler->join(); m_busHandler->join();
delete m_busHandler; delete m_busHandler;
m_busHandler = NULL;
} }
if (m_port != NULL) if (m_port != NULL) {
delete m_port; delete m_port;
m_port = NULL;
}
if (m_messages != NULL) if (m_messages != NULL) {
delete m_messages; delete m_messages;
m_messages = NULL;
}
if (m_templates != NULL) if (m_templates != NULL) {
delete m_templates; delete m_templates;
m_templates = NULL;
}
} }
extern result_t loadConfigFiles(DataFieldTemplates* templates, MessageMap* messages, bool verbose=false); extern result_t loadConfigFiles(DataFieldTemplates* templates, MessageMap* messages, bool verbose=false);