dont open epglist when no epg is avail

2 files changed, 2 insertions, 10 deletions

diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp
index 7b94a1a7..c1f294a6 100644
--- a/lib/dvb/epgcache.cpp
+++ b/lib/dvb/epgcache.cpp
@@ -747,14 +747,6 @@ void eEPGCache::save()
 #endif
 }
 
-RESULT eEPGCache::getInstance(eEPGCache *&ptr)
-{
-	ptr = instance;
-	if (!ptr)
-		return -1;
-	return 0;
-}
-
 eEPGCache::channel_data::channel_data(eEPGCache *ml)
 	:cache(ml)
 	,abortTimer(ml), zapTimer(ml)
diff --git a/lib/dvb/epgcache.h b/lib/dvb/epgcache.h
index 5643fa43..aa0410b3 100644
--- a/lib/dvb/epgcache.h
+++ b/lib/dvb/epgcache.h
@@ -223,7 +223,7 @@ private:
 	timeMap::iterator m_timemap_cursor, m_timemap_end;
 #endif // SWIG
 public:
-	static RESULT getInstance(eEPGCache *&ptr);
+	static eEPGCache *getInstance() { return instance; }
 	eEPGCache();
 	~eEPGCache();
 
@@ -257,7 +257,7 @@ public:
 	// eServiceEvent are parsed epg events.. it's safe to use them after cache unlock
 	// for use from python ( members: m_start_time, m_duration, m_short_description, m_extended_description )
 	RESULT lookupEvent(const eServiceReference &service, int event_id, ePtr<eServiceEvent> &);
-	RESULT lookupEvent(const eServiceReference &service, time_t , ePtr<eServiceEvent> &);
+	RESULT lookupEvent(const eServiceReference &service, time_t, ePtr<eServiceEvent> &);
 	RESULT getNextTimeEntry(ePtr<eServiceEvent> &);
 };