From 1111b6a89bf1aa8825dca76cc46e19cf669412e5 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sun, 3 Feb 2019 20:29:15 +1100 Subject: [PATCH] pause if preferences dialog is open, fixes #413 --- dialogs/preferencesdialog.h | 2 +- mainwindow.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dialogs/preferencesdialog.h b/dialogs/preferencesdialog.h index f086c1c40..2a6fa2cea 100644 --- a/dialogs/preferencesdialog.h +++ b/dialogs/preferencesdialog.h @@ -31,7 +31,7 @@ class PreferencesDialog : public QDialog Q_OBJECT public: - explicit PreferencesDialog(QWidget *parent = 0); + explicit PreferencesDialog(QWidget *parent = nullptr); ~PreferencesDialog(); void setup_kbd_shortcuts(QMenuBar* menu); diff --git a/mainwindow.cpp b/mainwindow.cpp index 08af530c9..64c374711 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1239,8 +1239,10 @@ void MainWindow::maximize_panel() { } } -void MainWindow::preferences() -{ +void MainWindow::preferences() { + panel_sequence_viewer->pause(); + panel_footage_viewer->pause(); + PreferencesDialog pd(this); pd.setup_kbd_shortcuts(menuBar()); pd.exec();