From a22348d267b3bbbd93015750aacb79ecceb462b4 Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Tue, 6 Nov 2012 01:34:28 +0100 Subject: [PATCH] [pvr] fixed - start and stop the pvr manager via app messenger when updating the guisetting. pvr may create a dialog or kaitoast notification, leading to a deadlock --- xbmc/settings/GUIWindowSettingsCategory.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xbmc/settings/GUIWindowSettingsCategory.cpp b/xbmc/settings/GUIWindowSettingsCategory.cpp index e7dabe8..d3825cd 100644 --- a/xbmc/settings/GUIWindowSettingsCategory.cpp +++ b/xbmc/settings/GUIWindowSettingsCategory.cpp @@ -1779,9 +1779,9 @@ void CGUIWindowSettingsCategory::OnSettingChanged(CBaseSettingControl *pSettingC else if (strSetting.Equals("pvrmanager.enabled")) { if (g_guiSettings.GetBool("pvrmanager.enabled")) - g_application.StartPVRManager(); + CApplicationMessenger::Get().ExecBuiltIn("XBMC.StartPVRManager", false); else - g_application.StopPVRManager(); + CApplicationMessenger::Get().ExecBuiltIn("XBMC.StopPVRManager", false); } else if (strSetting.Equals("masterlock.lockcode")) { -- 2.7.4