From 6f098a920ea19a4676808b053bdb5e9a8ec121bd Mon Sep 17 00:00:00 2001 From: Petar Popovic Date: Sun, 26 Jan 2025 04:56:16 +0100 Subject: [PATCH] Avoid a crash when a tray without a menu is clicked on Windows. --- src/tray/windows/SDL_tray.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/tray/windows/SDL_tray.c b/src/tray/windows/SDL_tray.c index a7e27c0699..32b5e85c56 100644 --- a/src/tray/windows/SDL_tray.c +++ b/src/tray/windows/SDL_tray.c @@ -115,7 +115,10 @@ LRESULT CALLBACK TrayWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPar case WM_TRAYICON: if (LOWORD(lParam) == WM_CONTEXTMENU || LOWORD(lParam) == WM_LBUTTONUP) { SetForegroundWindow(hwnd); - TrackPopupMenu(tray->menu->hMenu, TPM_BOTTOMALIGN | TPM_RIGHTALIGN, GET_X_LPARAM(wParam), GET_Y_LPARAM(wParam), 0, hwnd, NULL); + + if (tray->menu) { + TrackPopupMenu(tray->menu->hMenu, TPM_BOTTOMALIGN | TPM_RIGHTALIGN, GET_X_LPARAM(wParam), GET_Y_LPARAM(wParam), 0, hwnd, NULL); + } } break;