From 10a1c89464ee017d0b5fbcd4a2678520d16ca65c Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sat, 9 Feb 2019 15:15:34 -0800 Subject: [PATCH] fixed effect controls not updating if transitions from the selected clip are selected --- panels/effectcontrols.cpp | 4 ++++ panels/effectcontrols.h | 1 + panels/panels.cpp | 5 ++++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/panels/effectcontrols.cpp b/panels/effectcontrols.cpp index 89536bcfd..fd9969241 100644 --- a/panels/effectcontrols.cpp +++ b/panels/effectcontrols.cpp @@ -64,6 +64,10 @@ EffectControls::EffectControls(QWidget *parent) : EffectControls::~EffectControls() {} +int EffectControls::get_mode() { + return mode; +} + bool EffectControls::keyframe_focus() { return headers->hasFocus() || keyframeView->hasFocus(); } diff --git a/panels/effectcontrols.h b/panels/effectcontrols.h index 042b664b2..9ca830a9e 100644 --- a/panels/effectcontrols.h +++ b/panels/effectcontrols.h @@ -35,6 +35,7 @@ class EffectControls : public QDockWidget public: explicit EffectControls(QWidget *parent = 0); ~EffectControls(); + int get_mode(); void set_clips(QVector& clips, int mode); void clear_effects(bool clear_cache); void delete_effects(); diff --git a/panels/panels.cpp b/panels/panels.cpp index b460647c9..195acee58 100644 --- a/panels/panels.cpp +++ b/panels/panels.cpp @@ -88,7 +88,10 @@ void update_effect_controls() { } } - bool same = (selected_clips.size() == panel_effect_controls->selected_clips.size()); + + + bool same = (selected_clips.size() == panel_effect_controls->selected_clips.size() + && panel_effect_controls->get_mode() == mode); if (same) { for (int i=0;iselected_clips.at(i)) {