diff options
| author | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2010-04-13 12:12:19 +0200 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2010-04-13 17:21:26 +0200 |
| commit | 23b9251bc8ac02c862e55a180148474d49475d73 (patch) | |
| tree | ee5a26da48ed907d924c81be569c72a3702d940e | |
| parent | c7be07e504595d3434c61e79631b81a32099cc1e (diff) | |
| download | qt-creator-23b9251bc8ac02c862e55a180148474d49475d73.tar.gz | |
QmlDesigner.propertyEditor: fixes rare crashbug
(cherry picked from commit 375dd56ef007d6d4d1c97532940229e8faf99f12)
| -rw-r--r-- | src/plugins/qmldesigner/components/propertyeditor/propertyeditortransaction.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditortransaction.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditortransaction.cpp index 9b94842ccd..5287a7e8dd 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditortransaction.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditortransaction.cpp @@ -18,13 +18,12 @@ void PropertyEditorTransaction::start() void PropertyEditorTransaction::end() { - if (m_rewriterTransaction.isValid()) + if (m_rewriterTransaction.isValid() && m_propertyEditor->model()) m_rewriterTransaction.commit(); } void PropertyEditorTransaction::timerEvent(QTimerEvent *timerEvent) { - qDebug() << "timer"; killTimer(timerEvent->timerId()); if (m_rewriterTransaction.isValid()) m_rewriterTransaction.commit(); |