diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2007-10-06 15:01:23 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2007-10-06 15:01:23 +0000 |
| commit | a50379ad64b3f0b79af40876ebde0e6deb15d245 (patch) | |
| tree | 56b8df3be22446cb50a0cb1a7bfe3b91a7101a69 /lib | |
| parent | 8964693920977ec8a494fea6b4aeac4bbc016b65 (diff) | |
| download | enigma2-a50379ad64b3f0b79af40876ebde0e6deb15d245.tar.gz enigma2-a50379ad64b3f0b79af40876ebde0e6deb15d245.zip | |
fixes for clean enigma2 shutdown
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base/ebase.h | 5 | ||||
| -rw-r--r-- | lib/dvb/dvb.h | 2 | ||||
| -rw-r--r-- | lib/network/serversocket.lo | 0 |
3 files changed, 5 insertions, 2 deletions
diff --git a/lib/base/ebase.h b/lib/base/ebase.h index 27e4ec84..bab1b5f3 100644 --- a/lib/base/ebase.h +++ b/lib/base/ebase.h @@ -217,11 +217,14 @@ public: existing_loops.push_back(this); pthread_mutex_init(&recalcLock, 0); } - ~eMainloop() + virtual ~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(); } + int looplevel() { return loop_level; } #ifndef SWIG diff --git a/lib/dvb/dvb.h b/lib/dvb/dvb.h index 38d18f78..b23d047f 100644 --- a/lib/dvb/dvb.h +++ b/lib/dvb/dvb.h @@ -181,11 +181,11 @@ class eDVBResourceManager: public iObject, public Object Connection m_cached_channel_state_changed_conn; eTimer m_releaseCachedChannelTimer; void DVBChannelStateChanged(iDVBChannel*); - void releaseCachedChannel(); void feStateChanged(); #ifndef SWIG public: #endif + void releaseCachedChannel(); eDVBResourceManager(); virtual ~eDVBResourceManager(); diff --git a/lib/network/serversocket.lo b/lib/network/serversocket.lo deleted file mode 100644 index e69de29b..00000000 --- a/lib/network/serversocket.lo +++ /dev/null |