From a47b9cfa8d461e13748d39bc54fd817120e4f3d4 Mon Sep 17 00:00:00 2001
From: Athanasius <github@miggy.org>
Date: Tue, 13 Oct 2020 14:33:20 +0100
Subject: [PATCH] hotkey: Detailed logging in HotKeyMgr.unregister()

---
 hotkey.py | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/hotkey.py b/hotkey.py
index 9b261ccc..10bfa831 100644
--- a/hotkey.py
+++ b/hotkey.py
@@ -1,11 +1,17 @@
 # -*- coding: utf-8 -*-
 
-import os
-from os.path import dirname, join, normpath
-import sys
+import logging
+from os import getenv
+from os.path import join
 from sys import platform
 
-from config import config
+from config import appcmdname, appname, config
+
+if getenv("EDMC_NO_UI"):
+    logger = logging.getLogger(appcmdname)
+
+else:
+    logger = logging.getLogger(appname)
 
 if platform == 'darwin':
 
@@ -296,19 +302,31 @@ elif platform == 'win32':
 
         def register(self, root, keycode, modifiers):
             self.root = root
+
             if self.thread:
                 self.unregister()
+
             if keycode or modifiers:
                 self.thread = threading.Thread(target = self.worker, name = 'Hotkey "%x:%x"' % (keycode,modifiers), args = (keycode,modifiers))
                 self.thread.daemon = True
                 self.thread.start()
 
         def unregister(self):
+            """Unregister the hotkey handling."""
             thread = self.thread
+
             if thread:
+                logger.debug('Thread is/was running')
                 self.thread = None
+                logger.debug('Telling thread WM_QUIT')
                 PostThreadMessage(thread.ident, WM_QUIT, 0, 0)
-                thread.join()	# Wait for it to unregister hotkey and quit
+                logger.debug('Joining thread')
+                thread.join()  # Wait for it to unregister hotkey and quit
+
+            else:
+                logger.debug('No thread')
+
+            logger.debug('Done.')
 
         def worker(self, keycode, modifiers):