Merge branch 'development'

[deb_libcec.git] / src / LibCecTray / controller / applications / internal / XBMCControllerUI.cs

diff --git a/src/LibCecTray/controller/applications/internal/XBMCControllerUI.cs b/src/LibCecTray/controller/applications/internal/XBMCControllerUI.cs
index 0b6467c95c7baa3921992bc33b203d5c944bb8ea..7c2226f8c2002e9e10b3129ed1fbac8b2ed1c67c 100644 (file)
--- a/src/LibCecTray/controller/applications/internal/XBMCControllerUI.cs
+++ b/src/LibCecTray/controller/applications/internal/XBMCControllerUI.cs
@@ -55,6 +55,7 @@ namespace LibCECTray.controller.applications.@internal
       _controller.StandbyScreensaver.ReplaceControls(this, Controls, cbStandbyScreensaver);
       _controller.PowerOffOnStandby.ReplaceControls(this, Controls, cbStandbyTvStandby);
       _controller.SendInactiveSource.ReplaceControls(this, Controls, cbInactiveSource);
+      _controller.PausePlaybackOnDeactivate.ReplaceControls(this, Controls, cbPauseOnDeactivate);
 
       SetEnabled(false);
     }
@@ -76,7 +77,8 @@ namespace LibCECTray.controller.applications.@internal
       SetControlEnabled(_controller.SendInactiveSource.ValueControl, val);
       SetControlEnabled(bSaveConfig, val);
       SetControlEnabled(bLoadConfig, val);
-      SetControlEnabled(bConfigure, val);
+      SetControlEnabled(bConfigure, _controller.CanConfigureProcess && val);
+      SetControlEnabled(_controller.PausePlaybackOnDeactivate.ValueControl, val);
     }
 
     public override void SetStartButtonEnabled(bool val)