Merge remote-tracking branch 'origin/BUG-3895-Message_Override_Method…

…_Fix_(SelectItem_call)' into 1.3.0Alpha_final
MediaPortal · Jun 25, 2012 · fb12511 · fb12511
2 parents d32fa4f + fde131c
commit fb12511
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/mediaportal/WindowPlugins/WindowPluginBase.cs b/mediaportal/WindowPlugins/WindowPluginBase.cs
@@ -221,8 +221,14 @@ public override bool OnMessage(GUIMessage message)
         {
           // Set the new view.
           SetView(btnViews.SelectedItemValue);
-          SelectCurrentItem();
-
+
+          // View can switch screen (ie. in my vids from shares to dbviews) so we need to check that 
+          // because selectitem will be done on old screen and that can cause a trouble
+          if (GUIWindowManager.ActiveWindow == GetID)
+          {
+            SelectCurrentItem();  
+          }
+
           // Refocus on the view button control.
           GUIControl.FocusControl(GetID, message.TargetControlId);