From 1170e105bf5b797c0ed0202d98faf937057ac67b Mon Sep 17 00:00:00 2001
From: AdoWork <73101739+AdoWork@users.noreply.github.com>
Date: Thu, 4 May 2023 15:09:53 +0200
Subject: [PATCH] Bugfix: FileNotFoundError on Windows 11

It seems that Kvaser has changed the structure of the registry keys, at least on my machine (Windows 11, Kvaser CANLIB 5.41). By catching the FileNotFoundError exception, we can retry with the new registry path.
---
 canlib/dllLoader.py | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/canlib/dllLoader.py b/canlib/dllLoader.py
index f668457..2164e49 100644
--- a/canlib/dllLoader.py
+++ b/canlib/dllLoader.py
@@ -156,14 +156,18 @@ def load_dll(win_name=None, linux_name=None):
             else:
                 aKeyName = r"SOFTWARE\Wow6432Node\KVASER AB\CanlibSDK"
             aReg = winreg.ConnectRegistry(None, winreg.HKEY_LOCAL_MACHINE)
-            aKey = winreg.OpenKey(aReg, aKeyName)
-            aValue = winreg.QueryValueEx(aKey, "")
-            baseDir = str(aValue[0])
-
-            if 8 * struct.calcsize("P") == 32:
-                installDir = os.path.join(baseDir, "Bin")
-            else:
-                installDir = os.path.join(baseDir, "bin_x64")
+            try:
+                aKey = winreg.OpenKey(aReg, aKeyName)
+                aValue = winreg.QueryValueEx(aKey, "")
+                baseDir = str(aValue[0])
+                if 8 * struct.calcsize("P") == 32:
+                    installDir = os.path.join(baseDir, "Bin")
+                else:
+                    installDir = os.path.join(baseDir, "bin_x64")                
+            except FileNotFoundError:
+                aKey = winreg.OpenKey(aReg, r"SOFTWARE\Wow6432Node\KVASER AB\CANLIB32")
+                aValue = winreg.QueryValueEx(aKey, "InstallDir")
+                installDir = str(aValue[0])        
             installDir = os.path.realpath(installDir)
 
     if installDir: