tests/server/util.c: fix thread handle not being closed

Reviewed-by: Jay Satiro
Part of #5260

1 files changed, 9 insertions, 2 deletions

diff --git a/tests/server/util.c b/tests/server/util.c
index 99aa1de40..68889c0dc 100644
--- a/tests/server/util.c
+++ b/tests/server/util.c
@@ -803,8 +803,15 @@ void restore_signal_handlers(bool keep_sigalrm)
 #ifdef WIN32
   (void)SetConsoleCtrlHandler(ctrl_event_handler, FALSE);
   if(thread_main_window && thread_main_id) {
-    if(PostThreadMessage(thread_main_id, WM_APP, 0, 0))
-      (void)WaitForSingleObjectEx(thread_main_window, INFINITE, TRUE);
+    if(PostThreadMessage(thread_main_id, WM_APP, 0, 0)) {
+      if(WaitForSingleObjectEx(thread_main_window, INFINITE, TRUE)) {
+        if(CloseHandle(thread_main_window)) {
+          thread_main_window = NULL;
+          thread_main_id = 0;
+        }
+      }
+    }
+  }
   }
 #endif
 }