From 997e0b510b84a73435487aa518895d6b4a6e388a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Thu, 16 Feb 2017 16:52:30 +0100 Subject: [PATCH] Abort file analysis if file is about to be overwritten --- src/octoprint/filemanager/__init__.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/octoprint/filemanager/__init__.py b/src/octoprint/filemanager/__init__.py index f1db3460..de06893b 100644 --- a/src/octoprint/filemanager/__init__.py +++ b/src/octoprint/filemanager/__init__.py @@ -405,6 +405,10 @@ class FileManager(object): if hook_file_object is not None: file_object = hook_file_object + + queue_entry = self._analysis_queue_entry(destination, path) + self._analysis_queue.dequeue(queue_entry) + file_path = self._storage(destination).add_file(path, file_object, links=links, printer_profile=printer_profile, allow_overwrite=allow_overwrite) if analysis is None: