Merge branch 'Image_DragAndDrop' into 'master'

Fix bug #730 and #751 where DND images are loaded twice. See merge request openlp/openlp!292
2021-01-30 06:03:05 +00:00 · 2021-01-30 06:03:05 +00:00 · 44901c4cf5
commit 44901c4cf5
parent d465e692cd 7c57f1168d
1 changed files with 2 additions and 1 deletions
--- a/openlp/core/lib/mediamanageritem.py
+++ b/openlp/core/lib/mediamanageritem.py
@ -378,6 +378,7 @@ class MediaManagerItem(QtWidgets.QWidget, RegistryProperties):
        if new_file_paths:
            if 'target' in data:
                self.validate_and_load(new_file_paths, data['target'])
+            else:
                self.validate_and_load(new_file_paths)

    def dnd_move_internal(self, target):