Fix GUI exit

Author: a1ive

gnwinfo/context.c

@@ -324,6 +324,7 @@ gnwinfo_ctx_init(HINSTANCE inst, HWND wnd, struct nk_context* ctx, float width,
 	InitializeSRWLock(&g_ctx.lock);
 	g_ctx.update_mask = 0;
 	g_ctx.update_stop = 0;
+	g_ctx.exit_pending = 0;
 	g_ctx.update_event = CreateEventW(NULL, FALSE, FALSE, NULL);
 	if (g_ctx.update_event)
 		g_ctx.update_thread = CreateThread(NULL, 0, gnwinfo_ctx_update_thread, NULL, 0, NULL);

gnwinfo/gnwinfo.c

@@ -292,7 +292,7 @@ wWinMain(_In_ HINSTANCE hInstance,
 		nk_input_end(ctx);
 
 		/* GUI */
-		AcquireSRWLockShared(&g_ctx.lock);
+		AcquireSRWLockExclusive(&g_ctx.lock);
 		if (g_ctx.window_flag & GUI_WINDOW_SETTINGS)
 			gnwinfo_set_style(ctx);
 		gnwinfo_draw_main_window(ctx, g_ctx.gui_width, g_ctx.gui_height);
@@ -305,7 +305,9 @@ wWinMain(_In_ HINSTANCE hInstance,
 		gnwinfo_draw_display_window(ctx, g_ctx.gui_width, g_ctx.gui_height);
 		gnwinfo_draw_mm_window(ctx, g_ctx.gui_width, g_ctx.gui_height);
 		gnwinfo_draw_hostname_window(ctx, g_ctx.gui_width, g_ctx.gui_height);
-		ReleaseSRWLockShared(&g_ctx.lock);
+		ReleaseSRWLockExclusive(&g_ctx.lock);
+		if (g_ctx.exit_pending)
+			gnwinfo_ctx_exit();
 
 		/* Draw */
 		nk_gdip_render(g_ctx.gui_aa, g_color_back);

gnwinfo/gnwinfo.h

@@ -160,6 +160,7 @@ typedef struct _GNW_CONTEXT
 	HANDLE update_thread;
 	volatile LONG update_mask;
 	volatile LONG update_stop;
+	volatile LONG exit_pending;
 } GNW_CONTEXT;
 extern GNW_CONTEXT g_ctx;
 

gnwinfo/summary.c

@@ -784,7 +784,8 @@ gnwinfo_draw_main_window(struct nk_context* ctx, float width, float height)
 		nk_image_id(0), GET_PNG(IDR_PNG_CLOSE)))
 	{
 		nk_end(ctx);
-		gnwinfo_ctx_exit();
+		InterlockedExchange(&g_ctx.exit_pending, 1);
+		return;
 	}
 
 	nk_layout_row_begin(ctx, NK_DYNAMIC, 0, 4);
@@ -808,7 +809,7 @@ gnwinfo_draw_main_window(struct nk_context* ctx, float width, float height)
 		g_ctx.window_flag |= GUI_WINDOW_ABOUT;
 	nk_layout_row_push(ctx, g_ctx.gui_ratio);
 	if (nk_button_image_hover(ctx, GET_PNG(IDR_PNG_CLOSE), N_(N__CLOSE)))
-		gnwinfo_ctx_exit();
+		InterlockedExchange(&g_ctx.exit_pending, 1);
 	nk_layout_row_end(ctx);
 
 	if (g_ctx.main_flag & MAIN_INFO_OS)