fix frequently segfault on clean shutdown

1 files changed, 10 insertions, 0 deletions

diff --git a/lib/base/ebase.cpp b/lib/base/ebase.cpp
index 08c15610..effd7250 100644
--- a/lib/base/ebase.cpp
+++ b/lib/base/ebase.cpp
@@ -116,6 +116,16 @@ void eTimer::addTimeOffset( int offset )
 // mainloop
 ePtrList<eMainloop> eMainloop::existing_loops;
 
+eMainloop::~eMainloop()
+{
+	existing_loops.remove(this);
+	pthread_mutex_destroy(&recalcLock);
+	for (std::map<int, eSocketNotifier*>::iterator it(notifiers.begin());it != notifiers.end();++it)
+		it->second->stop();
+	while(m_timer_list.begin() != m_timer_list.end())
+		m_timer_list.begin()->stop();
+}
+
 void eMainloop::addSocketNotifier(eSocketNotifier *sn)
 {
 	int fd = sn->getFD();