git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix frequently segfaults
[enigma2.git]
/
lib
/
dvb
/
epgcache.h
diff --git
a/lib/dvb/epgcache.h
b/lib/dvb/epgcache.h
index af02ead666d714f35cfa90d15ca7573331a582b3..c692bc22aa4d5a3db1f2637dd9dfb97734a8591a 100644
(file)
--- a/
lib/dvb/epgcache.h
+++ b/
lib/dvb/epgcache.h
@@
-152,6
+152,7
@@
class eEPGCache: public eMainloop, private eThread, public Object
DECLARE_REF(eEPGCache)
struct channel_data: public Object
{
DECLARE_REF(eEPGCache)
struct channel_data: public Object
{
+ pthread_mutex_t channel_active;
channel_data(eEPGCache*);
eEPGCache *cache;
eTimer abortTimer, zapTimer;
channel_data(eEPGCache*);
eEPGCache *cache;
eTimer abortTimer, zapTimer;
@@
-171,9
+172,6
@@
class eEPGCache: public eMainloop, private eThread, public Object
std::set<__u8> seenPrivateSections;
void readPrivateData(const __u8 *data);
void startPrivateReader();
std::set<__u8> seenPrivateSections;
void readPrivateData(const __u8 *data);
void startPrivateReader();
- bool canDelete() { return !isRunning && !m_PrivateConn; }
-#else
- bool canDelete() { return !isRunning; }
#endif
#ifdef ENABLE_MHW_EPG
std::vector<mhw_channel_name_t> m_channels;
#endif
#ifdef ENABLE_MHW_EPG
std::vector<mhw_channel_name_t> m_channels;