From 36c167db5b11523f1adc7a61d135faaa3f8243a6 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 17 May 2019 16:25:16 +0200 Subject: [PATCH] Fix error message Task-number: QDS-664 Change-Id: Iba5b8917908c6a1e9068e813ca09f8ebe70a7a12 Reviewed-by: Tim Jenssen --- .../timelineeditor/timelinesettingsmodel.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesettingsmodel.cpp b/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesettingsmodel.cpp index d9e9fd8a1c0..509a8878e87 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesettingsmodel.cpp +++ b/src/plugins/qmldesigner/qmldesignerextension/timelineeditor/timelinesettingsmodel.cpp @@ -295,9 +295,11 @@ void TimelineSettingsModel::updateTimeline(int row) propertyChanges.modelNode().variantProperty("enabled").setValue(false); } - QmlPropertyChanges propertyChanges(modelState.propertyChanges(timeline)); - if (propertyChanges.isValid()) - propertyChanges.modelNode().variantProperty("enabled").setValue(true); + if (timeline.isValid()) { + QmlPropertyChanges propertyChanges(modelState.propertyChanges(timeline)); + if (propertyChanges.isValid()) + propertyChanges.modelNode().variantProperty("enabled").setValue(true); + } } } catch (Exception &e) { @@ -345,9 +347,11 @@ void TimelineSettingsModel::updateAnimation(int row) } } - QmlPropertyChanges propertyChanges(modelState.propertyChanges(animation)); - if (propertyChanges.isValid()) - propertyChanges.modelNode().variantProperty("running").setValue(true); + if (animation.isValid()) { + QmlPropertyChanges propertyChanges(modelState.propertyChanges(animation)); + if (propertyChanges.isValid()) + propertyChanges.modelNode().variantProperty("running").setValue(true); + } } } catch (Exception &e) { m_exceptionError = e.description();