Merge remote-tracking branch 'origin/unstable' into unstable

9 years ago · 46698924fd
parent 8e29ad4493 5aa9d4d7b9
commit 46698924fd
1 changed files with 2 additions and 1 deletions
--- a/gns3server/modules/vmware/vmware_vm.py
+++ b/gns3server/modules/vmware/vmware_vm.py
@ -397,7 +397,8 @@ class VMwareVM(BaseVM):
        Starts this VMware VM.
        """

-        if os.path.exists(self._vmx_path + ".lck"):
+        # The lock dection is not working on OSX the .lck is never deleted
+        if os.path.exists(self._vmx_path + ".lck") and not sys.platform.startswith("darwin"):
            raise VMwareError("VM locked, it is either running or being edited in VMware")

        ubridge_path = self.ubridge_path