Merge remote-tracking branch 'origin/master'

gns3server/modules/iou/__init__.py

@@ -49,9 +49,10 @@ class IOU(BaseManager):
     def close_vm(self, vm_id, *args, **kwargs):
 
         vm = self.get_vm(vm_id)
-        i = self._used_application_ids[vm_id]
-        self._free_application_ids.insert(0, i)
-        del self._used_application_ids[vm_id]
+        if vm_id in self._used_application_ids:
+            i = self._used_application_ids[vm_id]
+            self._free_application_ids.insert(0, i)
+            del self._used_application_ids[vm_id]
         yield from super().close_vm(vm_id, *args, **kwargs)
         return vm
 

gns3server/modules/iou/iou_vm.py

@@ -590,6 +590,7 @@ class IOUVM(BaseVM):
                 self._ioucon_thread = None
 
             self._terminate_process_iou()
+
             if self._iou_process.returncode is None:
                 try:
                     yield from gns3server.utils.asyncio.wait_for_process_termination(self._iou_process, timeout=3)