|
@@ -386,7 +386,7 @@ OBSBasic::OBSBasic(QWidget *parent)
|
|
// Register shortcuts for Undo/Redo
|
|
// Register shortcuts for Undo/Redo
|
|
ui->actionMainUndo->setShortcut(Qt::CTRL + Qt::Key_Z);
|
|
ui->actionMainUndo->setShortcut(Qt::CTRL + Qt::Key_Z);
|
|
QList<QKeySequence> shrt;
|
|
QList<QKeySequence> shrt;
|
|
- shrt << QKeySequence(Qt::CTRL | Qt::SHIFT + Qt::Key_Z)
|
|
|
|
|
|
+ shrt << QKeySequence((Qt::CTRL | Qt::SHIFT) + Qt::Key_Z)
|
|
<< QKeySequence(Qt::CTRL + Qt::Key_Y);
|
|
<< QKeySequence(Qt::CTRL + Qt::Key_Y);
|
|
ui->actionMainRedo->setShortcuts(shrt);
|
|
ui->actionMainRedo->setShortcuts(shrt);
|
|
|
|
|
|
@@ -6329,7 +6329,7 @@ void OBSBasic::StartStreaming()
|
|
void OBSBasic::BroadcastButtonClicked()
|
|
void OBSBasic::BroadcastButtonClicked()
|
|
{
|
|
{
|
|
if (!broadcastReady ||
|
|
if (!broadcastReady ||
|
|
- !broadcastActive && !outputHandler->StreamingActive()) {
|
|
|
|
|
|
+ (!broadcastActive && !outputHandler->StreamingActive())) {
|
|
SetupBroadcast();
|
|
SetupBroadcast();
|
|
if (broadcastReady)
|
|
if (broadcastReady)
|
|
ui->broadcastButton->setChecked(true);
|
|
ui->broadcastButton->setChecked(true);
|