From 7cc31e01e4d2db66296d94b73f7dcc790d6b7ebf Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Mon, 30 Dec 2019 16:11:03 +1100 Subject: [PATCH] fixed issue that didn't disable the time slider correctly in the KeyframePropertiesDialog --- app/dialog/keyframeproperties/keyframeproperties.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/app/dialog/keyframeproperties/keyframeproperties.cpp b/app/dialog/keyframeproperties/keyframeproperties.cpp index 6507bee66..c7aea9760 100644 --- a/app/dialog/keyframeproperties/keyframeproperties.cpp +++ b/app/dialog/keyframeproperties/keyframeproperties.cpp @@ -104,11 +104,9 @@ KeyframePropertiesDialog::KeyframePropertiesDialog(const QList // Determine if any keyframes are on the same track (in which case we can't set the time) if (can_set_time) { for (int j=0;jtrack() == keys_.at(i)->track()); - } - - if (!can_set_time) { + if (i != j + && keys_.at(j)->track() == keys_.at(i)->track()) { + can_set_time = false; break; } } @@ -131,9 +129,7 @@ KeyframePropertiesDialog::KeyframePropertiesDialog(const QList time_slider_->SetTristate(); } - if (!can_set_time) { - time_slider_->setEnabled(false); - } + time_slider_->setEnabled(can_set_time); if (!all_same_type) { // If all keyframes aren't the same type, add an empty item