From 7afac5f20667a02d0da474575d72d9bf443cfe77 Mon Sep 17 00:00:00 2001
From: Roy-043 <70520633+Roy-043@users.noreply.github.com>
Date: Mon, 8 Nov 2021 15:31:49 +0100
Subject: [PATCH] Draft: fix getTeighaConverter

The getTeighaConverter function did not work on Windows. We don't deal with the actual TeighaFileConverter anymore so there is no need to check for that file. Although the name of the function and the name of the parameter have been kept.
---
 src/Mod/Draft/importDWG.py | 39 +++++++++++++++-----------------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/src/Mod/Draft/importDWG.py b/src/Mod/Draft/importDWG.py
index 4fb042784f..05d4787111 100644
--- a/src/Mod/Draft/importDWG.py
+++ b/src/Mod/Draft/importDWG.py
@@ -151,34 +151,25 @@ def getTeighaConverter():
     -------
     str
         The full path of the converter executable
-        '/usr/bin/TeighaFileConverter'
+        '/usr/bin/ODAFileConverter'
     """
     import FreeCAD, os, platform
     p = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Mod/Draft")
-    p = p.GetString("TeighaFileConverter")
-    if p:
+    path = p.GetString("TeighaFileConverter")
+    if path:
         # path set manually
-        teigha = p
-    else:
-        # try to find teigha
-        teigha = None
-        if platform.system() == "Linux":
-            teigha = "/usr/bin/TeighaFileConverter"
-            if not os.path.exists(teigha):
-                teigha = "/usr/bin/ODAFileConverter"
-        elif platform.system() == "Windows":
-            odadir = os.path.expandvars("%ProgramFiles%\ODA")
-            if os.path.exists(odadir):
-                subdirs = os.walk(odadir).next()[1]
-                for sub in subdirs:
-                    t = (odadir + os.sep + sub + os.sep
-                         + "TeighaFileConverter.exe")
-                    t = os.path.join(odadir, sub, "TeighaFileConverter.exe")
-                    if os.path.exists(t):
-                        teigha = t
-    if teigha:
-        if os.path.exists(teigha):
-            return teigha
+        return path
+    elif platform.system() == "Linux":
+        path = "/usr/bin/ODAFileConverter"
+        if os.path.exists(path):
+            return path
+    elif platform.system() == "Windows":
+        odadir = os.path.expandvars("%ProgramFiles%\ODA")
+        if os.path.exists(odadir):
+            for sub in os.listdir(odadir):
+                path = os.path.join(odadir, sub, "ODAFileConverter.exe")
+                if os.path.exists(path):
+                    return path
     return None