1 files changed, 4 insertions, 7 deletions

diff --git a/src/main.c b/src/main.c
index 42fea369..4052b5a2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1007,19 +1007,16 @@ static void register_system_events(void)
 	ATOM klass;
 	HINSTANCE hmodule = GetModuleHandle(NULL);
 
-	if (hwnd)
-		return;
-	if (ctrl_handler_set)
-		return;
-
-	if (init_console_done) {
+	if (init_console_done && !ctrl_handler_set) {
 		debug_print("register_system_events(): SetConsoleCtrlHandler\n");
 		ctrl_handler_set = SetConsoleCtrlHandler(ctrl_handler, TRUE);
 		if (!ctrl_handler_set)
 			g_warning("SetConsoleCtrlHandler() failed\n");
-		return;
 	}
 
+	if (hwnd)
+		return;
+
 	debug_print("register_system_events(): RegisterClass\n");
 
 	memset(&wclass, 0, sizeof(WNDCLASS));