Skip to content

Commit

Permalink
Channel change event is not emitted when locked channel is set in the…
Browse files Browse the repository at this point in the history
… settings. Moved style command line argument to environment variable on startup.
  • Loading branch information
Peter Karlsson committed Dec 13, 2015
1 parent fbd9b34 commit 8e9c703
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion deploy/linux/run.sh
Expand Up @@ -4,4 +4,4 @@ cd "`dirname "$0"`"

export LD_LIBRARY_PATH=bin:$LD_LIBRARY_PATH

./bin/shell -style plastique "$@"
./bin/shell "$@"
2 changes: 1 addition & 1 deletion deploy/macx/MacOS/CasparCG Client
Expand Up @@ -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 "$@"
2 changes: 2 additions & 0 deletions src/Shell/Main.cpp
Expand Up @@ -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);
Expand Down
3 changes: 3 additions & 0 deletions src/Widgets/Inspector/InspectorOutputWidget.cpp
Expand Up @@ -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();
Expand Down

0 comments on commit 8e9c703

Please sign in to comment.