From 8e9c703ef94ee06f8125416a63d040d9db6e8b46 Mon Sep 17 00:00:00 2001
From: Peter Karlsson <peter@zapto.se>
Date: Sun, 13 Dec 2015 13:22:04 +0100
Subject: [PATCH] Channel change event is not emitted when locked channel is
 set in the settings. Moved style command line argument to environment
 variable on startup.

---
 deploy/linux/run.sh                             | 2 +-
 deploy/macx/MacOS/CasparCG Client               | 2 +-
 src/Shell/Main.cpp                              | 2 ++
 src/Widgets/Inspector/InspectorOutputWidget.cpp | 3 +++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/deploy/linux/run.sh b/deploy/linux/run.sh
index 19c57187f..0c78ce6b7 100755
--- a/deploy/linux/run.sh
+++ b/deploy/linux/run.sh
@@ -4,4 +4,4 @@ cd "`dirname "$0"`"
 
 export LD_LIBRARY_PATH=bin:$LD_LIBRARY_PATH
 
-./bin/shell -style plastique "$@"
+./bin/shell "$@"
diff --git a/deploy/macx/MacOS/CasparCG Client b/deploy/macx/MacOS/CasparCG Client
index f2ff289fb..3726e5412 100755
--- a/deploy/macx/MacOS/CasparCG Client	
+++ b/deploy/macx/MacOS/CasparCG Client	
@@ -5,4 +5,4 @@ cd "`dirname "$0"`"
 export VLC_PLUGIN_PATH=lib/plugins
 export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:lib
 
-./shell -style plastique "$@"
+./shell "$@"
diff --git a/src/Shell/Main.cpp b/src/Shell/Main.cpp
index afbbc0bfa..7f98889b6 100644
--- a/src/Shell/Main.cpp
+++ b/src/Shell/Main.cpp
@@ -279,6 +279,8 @@ CommandLineParseResult parseCommandLine(QCommandLineParser& parser, CommandLineA
 
 int main(int argc, char* argv[])
 {
+    qputenv("QT_STYLE_OVERRIDE", "plastique");
+
     qInstallMessageHandler(messageHandler);
 
     Application application(argc, argv);
diff --git a/src/Widgets/Inspector/InspectorOutputWidget.cpp b/src/Widgets/Inspector/InspectorOutputWidget.cpp
index 0a3fa410f..4caaeb5a0 100644
--- a/src/Widgets/Inspector/InspectorOutputWidget.cpp
+++ b/src/Widgets/Inspector/InspectorOutputWidget.cpp
@@ -380,6 +380,9 @@ void InspectorOutputWidget::rundownItemSelected(const RundownItemSelectedEvent&
     {
         this->spinBoxChannel->setEnabled(false);
         this->spinBoxChannel->setValue(deviceModel->getLockedChannel());
+
+        // Manually trigger the changed channel slot because we actively blocking signals.
+        channelChanged(deviceModel->getLockedChannel());
     }
 
     checkEmptyDevice();