ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-14 16:27:13 +03:00
Code Issues Projects Releases Wiki Activity

Clean up hotkey thread on exit on Windows

Browse Source
This commit is contained in:
Jonathan Harris 2016-09-06 12:41:02 +01:00
parent b6a5d7b8ed
commit 28169cc404
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hotkey.py
View File

@ -9,7 +9,6 @@ from config import config
if platform == 'darwin': if platform == 'darwin':
import threading
import objc import objc
from AppKit import NSApplication, NSWorkspace, NSBeep, NSSound, NSEvent, NSKeyDown, NSKeyUp, NSFlagsChanged, NSKeyDownMask, NSFlagsChangedMask, NSShiftKeyMask, NSControlKeyMask, NSAlternateKeyMask, NSCommandKeyMask, NSNumericPadKeyMask, NSDeviceIndependentModifierFlagsMask, NSF1FunctionKey, NSF35FunctionKey, NSDeleteFunctionKey, NSClearLineFunctionKey from AppKit import NSApplication, NSWorkspace, NSBeep, NSSound, NSEvent, NSKeyDown, NSKeyUp, NSFlagsChanged, NSKeyDownMask, NSFlagsChangedMask, NSShiftKeyMask, NSControlKeyMask, NSAlternateKeyMask, NSCommandKeyMask, NSNumericPadKeyMask, NSDeviceIndependentModifierFlagsMask, NSF1FunctionKey, NSF35FunctionKey, NSDeleteFunctionKey, NSClearLineFunctionKey
@ -180,6 +179,7 @@ if platform == 'darwin':
elif platform == 'win32': elif platform == 'win32':
import atexit
import ctypes import ctypes
from ctypes.wintypes import * from ctypes.wintypes import *
import threading import threading
@ -285,6 +285,7 @@ elif platform == 'win32':
self.thread = None self.thread = None
self.snd_good = open(join(config.respath, 'snd_good.wav'), 'rb').read() self.snd_good = open(join(config.respath, 'snd_good.wav'), 'rb').read()
self.snd_bad = open(join(config.respath, 'snd_bad.wav'), 'rb').read() self.snd_bad = open(join(config.respath, 'snd_bad.wav'), 'rb').read()
atexit.register(self.unregister)
def register(self, root, keycode, modifiers): def register(self, root, keycode, modifiers):
self.root = root self.root = root