Qt: epg: don't hide EPG when there's still data.

diff --git a/modules/gui/qt4/components/epg/EPGView.cpp b/modules/gui/qt4/components/epg/EPGView.cpp
index cddd58dff1e69e12e21e5865fec0c870aa7a2751..4e7e3dd239f43264eedc6db7fef5b18e2c1c39ab 100644 (file)
--- a/modules/gui/qt4/components/epg/EPGView.cpp
+++ b/modules/gui/qt4/components/epg/EPGView.cpp
@@ -104,6 +104,11 @@ const QDateTime& EPGView::baseTime()
     return m_baseTime;
 }
 
+bool EPGView::hasValidData()
+{
+    return !epgitemsByChannel.empty();
+}
+
 static void cleanOverlapped( EPGEventByTimeQMap *epgItemByTime, EPGItem *epgItem, QGraphicsScene *scene )
 {
     /* Clean overlapped programs */

diff --git a/modules/gui/qt4/components/epg/EPGView.hpp b/modules/gui/qt4/components/epg/EPGView.hpp
index e49a6e238b79bdf612099136afe660cc202a3ad3..ed5b44d77d0a7999446fea2e295f0a67395e2392 100644 (file)
--- a/modules/gui/qt4/components/epg/EPGView.hpp
+++ b/modules/gui/qt4/components/epg/EPGView.hpp
@@ -66,6 +66,7 @@ public:
     void            updateDuration();
     void            reset();
     void            cleanup();
+    bool            hasValidData();
 
 signals:
     void            startTimeChanged( const QDateTime& startTime );

diff --git a/modules/gui/qt4/components/epg/EPGWidget.cpp b/modules/gui/qt4/components/epg/EPGWidget.cpp
index d32c181e2fa506a541c24561b1d9db5a42fbd97c..cc1391ca16ff141ceec1c0debd08e070b45ed4e5 100644 (file)
--- a/modules/gui/qt4/components/epg/EPGWidget.cpp
+++ b/modules/gui/qt4/components/epg/EPGWidget.cpp
@@ -102,7 +102,6 @@ void EPGWidget::updateEPG( vlc_epg_t **pp_epg, int i_epg, uint8_t i_input_type )
     b_input_type_known = true;
 
     m_epgView->cleanup(); /* expire items and flags */
-    rootWidget->setCurrentIndex( ( i_epg > 0 ) ? 0 : 1 );
 
     for ( int i = 0; i < i_epg; ++i )
     {
@@ -117,6 +116,9 @@ void EPGWidget::updateEPG( vlc_epg_t **pp_epg, int i_epg, uint8_t i_input_type )
         }
     }
 
+    /* toggle our widget view */
+    rootWidget->setCurrentIndex( m_epgView->hasValidData() ? 0 : 1 );
+
     // Update the global duration and start time.
     m_epgView->updateDuration();
     m_epgView->updateStartTime();