Moved control reset logic from GUIDiaogSelect(2).SetHeading() to OnMe…

…ssage() behind GUI_MSG_WINDOW_INIT.
MediaPortal · Nov 17, 2012 · eb06b2c · eb06b2c
1 parent 65a2508
commit eb06b2c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/mediaportal/Dialogs/Dialogs/GUIDialogSelect.cs b/mediaportal/Dialogs/Dialogs/GUIDialogSelect.cs
@@ -101,6 +101,11 @@ public override bool OnMessage(GUIMessage message)
           {
             m_bButtonPressed = false;
             base.OnMessage(message);
+
+            Reset();
+            AllocResources();
+            InitControls();
+
             _selectedLabel = -1;
             ClearControl(GetID, (int)Controls.CONTROL_LIST);
 
@@ -246,11 +251,12 @@ public string SelectedLabelText
 
     public void SetHeading(string strLine)
     {
+      /*    
       Reset();
       //LoadSkin();
       AllocResources();
       InitControls();
-
+      */
       SetControlLabel(GetID, (int)Controls.CONTROL_HEADING, strLine);
     }
 

diff --git a/mediaportal/Dialogs/Dialogs/GUIDialogSelect2.cs b/mediaportal/Dialogs/Dialogs/GUIDialogSelect2.cs
@@ -65,6 +65,11 @@ public override bool OnMessage(GUIMessage message)
         case GUIMessage.MessageType.GUI_MSG_WINDOW_INIT:
           {
             base.OnMessage(message);
+
+            Reset();
+            AllocResources();
+            InitControls();
+
             ClearControl(GetID, (int)Controls.CONTROL_LIST);
 
             for (int i = 0; i < m_vecList.Count; i++)
@@ -123,11 +128,12 @@ public string SelectedLabelText
 
     public void SetHeading(string strLine)
     {
+      /*
       Reset();
       //LoadSkin();
       AllocResources();
       InitControls();
-
+      */
       SetControlLabel(GetID, (int)Controls.CONTROL_HEADING, strLine);
     }