eessppeelllloo/kdenlive
1
0
Fork 0
mirror of https://invent.kde.org/multimedia/kdenlive synced 2025-12-07 16:59:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix concurrency issue breaking effect parameters.

Browse Source 
Related to #1359
This commit is contained in:
Jean-Baptiste Mardelle
2022-03-08 10:30:38 +01:00
parent b306398646
commit b5de156b82
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/assets/keyframes/model/keyframemodel.cpp
View File

@@ -883,7 +883,7 @@ void KeyframeModel::parseAnimProperty(const QString &prop)
{
Fun undo = []() { return true; };
Fun redo = []() { return true; };
disconnect(this, &KeyframeModel::modelChanged, this, &KeyframeModel::sendModification);
QSignalBlocker bk(this);
removeAllKeyframes(undo, redo);
int in = 0;
int out = 0;
@@ -938,7 +938,6 @@ void KeyframeModel::parseAnimProperty(const QString &prop)
}
addKeyframe(GenTime(frame, pCore->getCurrentFps()), convertFromMltType(type), value, true, undo, redo);
}
connect(this, &KeyframeModel::modelChanged, this, &KeyframeModel::sendModification);
}
void KeyframeModel::resetAnimProperty(const QString &prop)
@@ -947,7 +946,7 @@ void KeyframeModel::resetAnimProperty(const QString &prop)
Fun redo = []() { return true; };
// Delete all existing keyframes
disconnect(this, &KeyframeModel::modelChanged, this, &KeyframeModel::sendModification);
QSignalBlocker bk(this);
removeAllKeyframes(undo, redo);
Mlt::Properties mlt_prop;
@@ -1014,7 +1013,6 @@ void KeyframeModel::resetAnimProperty(const QString &prop)
PUSH_LAMBDA(update_local, undo);
PUSH_LAMBDA(update_local, redo);
PUSH_UNDO(undo, redo, i18n("Reset %1", effectName));
connect(this, &KeyframeModel::modelChanged, this, &KeyframeModel::sendModification);
}
void KeyframeModel::parseRotoProperty(const QString &prop)

3
src/widgets/doublewidget.cpp
View File

@@ -57,9 +57,8 @@ void DoubleWidget::setSpinSize(int width)
void DoubleWidget::setValue(double value)
{
m_dragVal->blockSignals(true);
QSignalBlocker bk(m_dragVal);
m_dragVal->setValue(value * m_factor);
m_dragVal->blockSignals(false);
}
void DoubleWidget::enableEdit(bool enable)