From 63f3e542eee1cf3558865b1f4152c9fa0f68c532 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Mon, 4 May 2020 12:58:28 +1000 Subject: [PATCH 1/3] style: fixed windows compile issue --- app/window/mainwindow/mainmenu.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/window/mainwindow/mainmenu.cpp b/app/window/mainwindow/mainmenu.cpp index 46e7527f5..588939887 100644 --- a/app/window/mainwindow/mainmenu.cpp +++ b/app/window/mainwindow/mainmenu.cpp @@ -39,9 +39,7 @@ OLIVE_NAMESPACE_ENTER MainMenu::MainMenu(MainWindow *parent) : QMenuBar(parent) { -#ifdef Q_OS_WINDOWS - StyleManager::UseNativeWindowsStyling(this); -#endif + StyleManager::UseOSNativeStyling(this); // // FILE MENU From b80eb6fd45773ca23e14abee3a4e42fba6a710e2 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Tue, 5 May 2020 00:36:28 +1000 Subject: [PATCH 2/3] track: fixed segfault if user tried to use "add" tool on nonexistant track --- app/node/output/track/tracklist.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/node/output/track/tracklist.cpp b/app/node/output/track/tracklist.cpp index 743c1b50b..07b7678c0 100644 --- a/app/node/output/track/tracklist.cpp +++ b/app/node/output/track/tracklist.cpp @@ -57,7 +57,11 @@ const QVector &TrackList::GetTracks() const TrackOutput *TrackList::GetTrackAt(int index) const { - return track_cache_.at(index); + if (index < track_cache_.size()) { + return track_cache_.at(index); + } else { + return nullptr; + } } const rational &TrackList::GetTotalLength() const From 30efe054c70e4b642ffad19f93550ea38d31eca1 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Tue, 5 May 2020 00:42:55 +1000 Subject: [PATCH 3/3] colordialog: if display changes, ensure views change before anything else Prevents exception if new display doesn't contain current view. --- app/widget/colorwheel/colorspacechooser.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/widget/colorwheel/colorspacechooser.cpp b/app/widget/colorwheel/colorspacechooser.cpp index 78b292098..14a58108c 100644 --- a/app/widget/colorwheel/colorspacechooser.cpp +++ b/app/widget/colorwheel/colorspacechooser.cpp @@ -85,7 +85,6 @@ ColorSpaceChooser::ColorSpaceChooser(ColorManager* color_manager, bool enable_in display_combobox_->setCurrentText(color_manager_->GetDefaultDisplay()); connect(display_combobox_, &QComboBox::currentTextChanged, this, &ColorSpaceChooser::ComboBoxChanged); - connect(display_combobox_, &QComboBox::currentTextChanged, this, &ColorSpaceChooser::UpdateViews); } row++; @@ -184,6 +183,10 @@ void ColorSpaceChooser::UpdateViews(const QString& display) void ColorSpaceChooser::ComboBoxChanged() { + if (sender() == display_combobox_) { + UpdateViews(display_combobox_->currentText()); + } + if (input_combobox_) { emit InputColorSpaceChanged(input()); }