From dace8289b5fa8e81b661bd8d1446dd518e486023 Mon Sep 17 00:00:00 2001 From: sebastiii Date: Sat, 15 Jun 2013 17:19:15 +0200 Subject: [PATCH] Fix / Workaround about issue : http://mantis.team-mediaportal.com/view.php?id=4447 Force to init allocresource to avoid null exception on OnGetIMDBInfo(). Disable Cast / Watched Status (not handle from TV Guide/Fullscreen). --- TvEngine3/TVLibrary/TvPlugin/TvPlugin/TvFullScreen.cs | 17 ++++++++++++++++- TvEngine3/TVLibrary/TvPlugin/TvPlugin/TvGuideBase.cs | 16 +++++++++++++++- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TvFullScreen.cs b/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TvFullScreen.cs index f83ddbd..5fdc9aa 100644 --- a/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TvFullScreen.cs +++ b/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TvFullScreen.cs @@ -1803,9 +1803,24 @@ namespace TvPlugin if (IMDBFetcher.GetInfoFromIMDB(this, ref movieDetails, true, false)) { GUIVideoInfo videoInfo = (GUIVideoInfo)GUIWindowManager.GetWindow((int)Window.WINDOW_VIDEO_INFO); + videoInfo.AllocResources(); videoInfo.Movie = movieDetails; GUIButtonControl btnPlay = (GUIButtonControl)videoInfo.GetControl(2); - btnPlay.Visible = false; + if (btnPlay != null) + { + btnPlay.Visible = false; + } + GUICheckButton btnCast = (GUICheckButton)videoInfo.GetControl(4); + if (btnCast != null) + { + btnCast.Visible = false; + } + GUICheckButton btnWatched = (GUICheckButton)videoInfo.GetControl(6); + if (btnWatched != null) + { + btnWatched.Visible = false; + } + GUIWindowManager.ActivateWindow((int)Window.WINDOW_VIDEO_INFO); } else diff --git a/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TvGuideBase.cs b/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TvGuideBase.cs index 67691b5..c561e7b 100644 --- a/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TvGuideBase.cs +++ b/TvEngine3/TVLibrary/TvPlugin/TvPlugin/TvGuideBase.cs @@ -3588,9 +3588,23 @@ namespace TvPlugin prog.Persist(); } GUIVideoInfo videoInfo = (GUIVideoInfo)GUIWindowManager.GetWindow((int)Window.WINDOW_VIDEO_INFO); + videoInfo.AllocResources(); videoInfo.Movie = movieDetails; GUIButtonControl btnPlay = (GUIButtonControl)videoInfo.GetControl(2); - btnPlay.Visible = false; + if (btnPlay != null) + { + btnPlay.Visible = false; + } + GUICheckButton btnCast = (GUICheckButton)videoInfo.GetControl(4); + if (btnCast != null) + { + btnCast.Visible = false; + } + GUICheckButton btnWatched = (GUICheckButton)videoInfo.GetControl(6); + if (btnWatched != null) + { + btnWatched.Visible = false; + } GUIWindowManager.ActivateWindow((int)Window.WINDOW_VIDEO_INFO); } else -- 1.8.0.msysgit.0