Fix for 'Crash double-clicking any knob in debug build (git master) (L…

…MMS#948)' Conflicts: src/gui/widgets/knob.cpp
krafczyk · Sep 8, 2014 · 84895a4 · 84895a4
1 parent 619f912
commit 84895a4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/include/JournallingObject.h b/include/JournallingObject.h
@@ -77,6 +77,9 @@ class EXPORT JournallingObject : public SerializingObject
  return oldJournalling;
  }
 
+ inline bool isEmpty() {
+ return m_journallingStateStack.isEmpty();
+ }
 
 protected:
  void changeID( jo_id_t _id );

diff --git a/src/gui/widgets/knob.cpp b/src/gui/widgets/knob.cpp
@@ -592,7 +592,9 @@ void knob::mouseReleaseEvent( QMouseEvent* event )
  AutomatableModel *thisModel = model();
  if( thisModel )
  {
- thisModel->restoreJournallingState();
+ if(!thisModel->isEmpty()) {
+ thisModel->restoreJournallingState();
+ }
  }
  }