Merge remote-tracking branch 'origin/master'

gns3server/crash_report.py

@@ -19,6 +19,10 @@ import os
 import sys
 import struct
 import platform
+import faulthandler
+
+# Display a traceback in case of segfault crash. Usefull when frozen
+faulthandler.enable()
 
 try:
     import raven

gns3server/modules/qemu/__init__.py

@@ -74,7 +74,11 @@ class Qemu(BaseManager):
             # add specific locations on Mac OS X regardless of what's in $PATH
             paths.extend(["/usr/local/bin", "/opt/local/bin"])
             if hasattr(sys, "frozen"):
-                paths.append(os.path.abspath(os.path.join(os.getcwd(), "../../../qemu/bin/")))
+                try:
+                    paths.append(os.path.abspath(os.path.join(os.getcwd(), "../../../qemu/bin/")))
+                # If the user run the server by hand from outside
+                except FileNotFoundError:
+                    paths.append(["/Applications/GNS3.app/Contents/Resources/qemu/bin"])
         for path in paths:
             try:
                 for f in os.listdir(path):