From b4bfee119399337ae141ac3df830f1c98344ee1e Mon Sep 17 00:00:00 2001
From: Thomas Wilshaw <thomaswilshaw@gmail.com>
Date: Mon, 8 Nov 2021 20:20:44 +0000
Subject: [PATCH] Add warning for malformed XML data

---
 app/widget/marker/markercopypaste.cpp | 13 +++++++++++++
 app/widget/marker/markercopypaste.h   |  1 +
 2 files changed, 14 insertions(+)

diff --git a/app/widget/marker/markercopypaste.cpp b/app/widget/marker/markercopypaste.cpp
index 4a2eddbe3..d5710ef27 100644
--- a/app/widget/marker/markercopypaste.cpp
+++ b/app/widget/marker/markercopypaste.cpp
@@ -15,6 +15,8 @@
 
 #include "markercopypaste.h"
 
+#include <QMessageBox>
+
 #include "core.h"
 #include "markerundo.h"
 #include "widget/timebased/timebasedwidget.h"
@@ -120,6 +122,17 @@ void MarkerCopyPasteService::PasteMarkersFromClipboard(TimelineMarkerList* list,
     }
   }
 
+  if (reader.hasError()) {
+    // If this was NOT an internal error, we assume it's an XML error that the user needs to know about
+    QMessageBox::critical((QWidget*)Core::instance()->main_window(),
+                          QCoreApplication::translate("MarkerCopyPasteWidget", "Error pasting markers"),
+                          QCoreApplication::translate("MarkerCopyPasteWidget", "Failed to paste markers: %1").arg(reader.errorString()),
+                          QMessageBox::Ok);
+
+    return;
+  }
+
   Core::instance()->undo_stack()->pushIfHasChildren(command);
+
 }
 } //namespace olive
diff --git a/app/widget/marker/markercopypaste.h b/app/widget/marker/markercopypaste.h
index 7566ad805..36ca175a7 100644
--- a/app/widget/marker/markercopypaste.h
+++ b/app/widget/marker/markercopypaste.h
@@ -16,6 +16,7 @@
 #ifndef MARKERCOPYPASTEWIDGET_H
 #define MARKERCOPYPASTEWIDGET_H
 
+#include <QWidget>
 #include <QUndoCommand>
 
 #include "widget/marker/marker.h"