Ticket #7716: 7716_v1.diff

libs/libmythui/mythscreentype.h

@@ -49 +49 @@
 
     void doInit(void);
     void LoadInForeground(void);
+    bool IsInitialized(void) const;
 
     // if the widget is full screen and obscures widgets below it
     bool IsFullscreen(void) const;
@@ -100 +101 @@
     bool m_IsDeleting;
     bool m_IsLoading;
     bool m_IsLoaded;
+    bool m_IsInitialized;
 
     MythUIType *m_CurrentFocusWidget;
     //TODO We are currently dependant on the internal sorting of QMap for

libs/libmythui/mythscreentype.cpp

@@ -45 +45 @@
     m_IsDeleting = false;
     m_IsLoading = false;
     m_IsLoaded = false;
+    m_IsInitialized = false;
 
     // Can be overridden, of course, but default to full sized.
     m_Area = GetMythMainWindow()->GetUIScreenRect();
@@ -58 +59 @@
     m_CurrentFocusWidget = NULL;
 
     m_ScreenStack = NULL;
+    m_BusyPopup = NULL;
     m_IsDeleting = false;
+    m_IsLoading = false;
+    m_IsLoaded = false;
+    m_IsInitialized = false;
 
     m_Area = GetMythMainWindow()->GetUIScreenRect();
 }
@@ -297 +302 @@
     m_BusyPopup = NULL;
 }
 
+bool MythScreenType::IsInitialized(void) const
+{
+    return m_IsInitialized;
+}
+
 void MythScreenType::doInit(void)
 {
     CloseBusyPopup();
     Init();
+    m_IsInitialized = true;
 }
 
 void MythScreenType::Init(void)

libs/libmythui/mythuihelper.h

@@ -59 +59 @@
     Settings *qtconfig(void);
 
     bool IsScreenSetup(void);
+    bool IsTopScreenInitialized(void);
 
     // which the user may have set to be different from the raw screen size
     void GetScreenSettings(float &wmult, float &hmult);

libs/libmythui/mythuihelper.cpp

@@ -365 +365 @@
     return d->screenSetup;
 }
 
+bool MythUIHelper::IsTopScreenInitialized(void)
+{
+        return GetMythMainWindow()->GetMainStack()->GetTopScreen()->IsInitialized();
+}
+
 void MythUIHelper::LoadQtConfig(void)
 {
     d->language.clear();

programs/mythfrontend/networkcontrol.cpp

@@ -629 +629 @@
             while ((timer.elapsed() < 10000) &&
                    (GetMythUI()->GetCurrentLocation().toLower() != "playbackbox"))
                 usleep(10000);
+
+            timer.start();
+            while ((timer.elapsed() < 10000) &&
+                   (!GetMythUI()->IsTopScreenInitialized()))
+                usleep(10000);
         }
 
         if (GetMythUI()->GetCurrentLocation().toLower() == "playbackbox")