3 files changed, 8 insertions, 3 deletions

diff --git a/src/app.c b/src/app.c
index e9a2c638..90ad271d 100644
--- a/src/app.c
+++ b/src/app.c
@@ -702,7 +702,7 @@ static int resizeWatcher_(void *user, SDL_Event *event) {
             SDL_Event u = { .type = SDL_USEREVENT };
             u.user.code = command_UserEventCode;
             u.user.data1 = strdup("theme.changed");
-            u.user.windowID = SDL_GetWindowID(d->window->win);
+            u.user.windowID = id_Window(d->window);
             dispatchEvent_Widget(d->window->root, &u);
         }
 #endif
@@ -795,7 +795,7 @@ void postRefresh_App(void) {
         SDL_Event ev;
         ev.user.type     = SDL_USEREVENT;
         ev.user.code     = refresh_UserEventCode;
-        ev.user.windowID = get_Window() ? SDL_GetWindowID(get_Window()->win) : 0;
+        ev.user.windowID = id_Window(get_Window());
         ev.user.data1    = NULL;
         ev.user.data2    = NULL;
         SDL_PushEvent(&ev);
@@ -820,7 +820,7 @@ void postCommand_App(const char *command) {
     }
     ev.user.type     = SDL_USEREVENT;
     ev.user.code     = command_UserEventCode;
-    ev.user.windowID = get_Window() ? SDL_GetWindowID(get_Window()->win) : 0;
+    ev.user.windowID = id_Window(get_Window());
     ev.user.data1    = strdup(command);
     ev.user.data2    = NULL;
     SDL_PushEvent(&ev);
diff --git a/src/ui/window.c b/src/ui/window.c
index f9e58acb..2062a3bb 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -1055,6 +1055,10 @@ void setCursor_Window(iWindow *d, int cursor) {
     d->pendingCursor = d->cursors[cursor];
 }
 
+uint32_t id_Window(const iWindow *d) {
+    return d && d->win ? SDL_GetWindowID(d->win) : 0;
+}
+
 iInt2 rootSize_Window(const iWindow *d) {
     return d->root->rect.size;
 }
diff --git a/src/ui/window.h b/src/ui/window.h
index 9e3f16bc..25d81e6f 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -60,6 +60,7 @@ void        setUiScale_Window       (iWindow *, float uiScale);
 void        setFreezeDraw_Window    (iWindow *, iBool freezeDraw);
 void        setCursor_Window        (iWindow *, int cursor);
 
+uint32_t    id_Window               (const iWindow *);
 iInt2       rootSize_Window         (const iWindow *);
 float       uiScale_Window          (const iWindow *);
 iInt2       coord_Window            (const iWindow *, int x, int y);