X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=gui%2Ftinc-gui;h=24ca96e8f99dbceb011ac53628b042f91bc33842;hp=64b738ebaee196076f3dea2a3633b7417fb176f1;hb=c10f3105b354c523d4d4d36b09dd46f890e94a30;hpb=ab583f7e8c550822c63a1a6b73a7a329f622d9e0 diff --git a/gui/tinc-gui b/gui/tinc-gui index 64b738eb..24ca96e8 100755 --- a/gui/tinc-gui +++ b/gui/tinc-gui @@ -234,9 +234,15 @@ class VPN: def __init__(self, netname = None, pidfile = None): if platform.system() == 'Windows': + sam = _winreg.KEY_READ + if platform.machine().endswith('64'): + sam = sam | _winreg.KEY_WOW64_64KEY try: reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE) - key = _winreg.OpenKey(reg, "SOFTWARE\\tinc") + try: + key = _winreg.OpenKey(reg, "SOFTWARE\\tinc", 0, sam) + except WindowsError: + key = _winreg.OpenKey(reg, "SOFTWARE\\Wow6432Node\\tinc", 0, sam) VPN.confdir = _winreg.QueryValue(key, None) except WindowsError: pass