Fix some avformat producer concurrency crashes

[kdenlive] / src / addmarkercommand.cpp

diff --git a/src/addmarkercommand.cpp b/src/addmarkercommand.cpp
index 9055fcb53dacf9eb44be93db771c7ae11e0c7860..bc6d73207d874b55f167ede86b9f01a4b3b1a52c 100644 (file)
--- a/src/addmarkercommand.cpp
+++ b/src/addmarkercommand.cpp
@@ -14,27 +14,35 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include <KLocale>
+
 
 #include "addmarkercommand.h"
 #include "customtrackview.h"
 
-AddMarkerCommand::AddMarkerCommand(CustomTrackView *view, const QString &oldcomment, const QString &comment, const int id, const GenTime &pos, bool doIt) : m_view(view), m_oldcomment(oldcomment), m_comment(comment), m_id(id), m_pos(pos), m_doIt(doIt) {
+#include <KLocale>
+
+AddMarkerCommand::AddMarkerCommand(CustomTrackView *view, const QString &oldcomment, const QString &comment, const QString &id, const GenTime &pos, QUndoCommand * parent) :
+        QUndoCommand(parent),
+        m_view(view),
+        m_oldcomment(oldcomment),
+        m_comment(comment),
+        m_id(id),
+        m_pos(pos)
+{
     if (m_comment.isEmpty()) setText(i18n("Delete marker"));
-    else setText(i18n("Add marker"));
+    else if (m_oldcomment.isEmpty()) setText(i18n("Add marker"));
+    else setText(i18n("Edit marker"));
 }
 
 
 // virtual
-void AddMarkerCommand::undo() {
+void AddMarkerCommand::undo()
+{
     m_view->addMarker(m_id, m_pos, m_oldcomment);
 }
 // virtual
-void AddMarkerCommand::redo() {
-    if (m_doIt) {
-        m_view->addMarker(m_id, m_pos, m_comment);
-    }
-    m_doIt = true;
+void AddMarkerCommand::redo()
+{
+    m_view->addMarker(m_id, m_pos, m_comment);
 }
 
-#include "addmarkercommand.moc"