Merge remote-tracking branch 'origin/main' into serialize_funct_h5

# Conflicts:
#	executorlib/interactive/shared.py

Author: jan-janssen

executorlib/base/executor.py

@@ -116,10 +116,11 @@ def shutdown(self, wait: bool = True, *, cancel_futures: bool = False):
         """
         if cancel_futures:
             cancel_items_in_queue(que=self._future_queue)
-        self._future_queue.put({"shutdown": True, "wait": wait})
-        if wait and self._process is not None:
-            self._process.join()
-            self._future_queue.join()
+        if self._process is not None:
+            self._future_queue.put({"shutdown": True, "wait": wait})
+            if wait:
+                self._process.join()
+                self._future_queue.join()
         self._process = None
         self._future_queue = None