[Editor] Do not paste empty clipboard + clear clipboard on close

mean00 · Oct 23, 2016 · c51c1ea · c51c1ea
1 parent c61ee89
commit c51c1ea
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/avidemux/common/ADM_editor/src/ADM_segment.cpp b/avidemux/common/ADM_editor/src/ADM_segment.cpp
@@ -250,6 +250,7 @@ bool ADM_EditorSegment::deleteAll (void)
 
     }
 
+    clipboard.clear();
     videos.clear();
     segments.clear();
     undoSegments.clear();
@@ -892,6 +893,11 @@ bool        ADM_EditorSegment::dumpClipBoard()
  */
 bool        ADM_EditorSegment::pasteFromClipBoard(uint64_t currentTime)
 {
+    if(!clipboard.size())
+    {
+        ADM_info("The clipboard is empty, nothing to do\n");
+        return true;
+    }
     ADM_info("Pasting from clipboard to %s\n",ADM_us2plain(currentTime));
     uint32_t startSeg;
     uint64_t startSegTime;