2 files changed, 12 insertions, 5 deletions

diff --git a/src/ui/text.c b/src/ui/text.c
index 3d208b68..04bb17a2 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -488,11 +488,11 @@ static void cache_Font_(iFont *d, iGlyph *glyph, int hoff) {
         SDL_SetTextureBlendMode(tex, SDL_BLENDMODE_NONE);
         glRect->size = init_I2(surface->w, surface->h);
     }
-    /* Determine placement in the glyph cache texture, advancing in rows. */
-    glRect->pos = assignCachePos_Text_(txt, glRect->size);
-    const SDL_Rect dstRect = sdlRect_(*glRect);
-    SDL_RenderCopy(render, tex, &(SDL_Rect){ 0, 0, dstRect.w, dstRect.h }, &dstRect);
     if (tex) {
+        /* Determine placement in the glyph cache texture, advancing in rows. */
+        glRect->pos = assignCachePos_Text_(txt, glRect->size);
+        const SDL_Rect dstRect = sdlRect_(*glRect);
+        SDL_RenderCopy(render, tex, &(SDL_Rect){ 0, 0, dstRect.w, dstRect.h }, &dstRect);
         SDL_DestroyTexture(tex);
         iAssert(surface);
         SDL_FreeSurface(surface);
diff --git a/src/ui/window.c b/src/ui/window.c
index 8aa701e3..2b2dae46 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -515,7 +515,7 @@ static void drawBlank_Window_(iWindow *d) {
 }
 
 iBool create_Window_(iWindow *d, iRect rect, uint32_t flags) {
-    flags |= SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI;
+    flags |= SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI | SDL_WINDOW_HIDDEN;
     if (SDL_CreateWindowAndRenderer(
             width_Rect(rect), height_Rect(rect), flags, &d->win, &d->render)) {
         return iFalse;
@@ -711,6 +711,13 @@ iBool processEvent_Window(iWindow *d, const SDL_Event *ev) {
             SDL_Event event = *ev;
             if (event.type == SDL_USEREVENT && isCommand_UserEvent(ev, "window.unfreeze")) {
                 d->isDrawFrozen = iFalse;
+                /* When the window is shown for the first time, ensure glyphs get
+                   re-cached correctly. */
+                if (SDL_GetWindowFlags(d->win) & SDL_WINDOW_HIDDEN) {
+                    SDL_ShowWindow(d->win);
+                    resetFonts_Text();
+                    postCommand_App("theme.changed");
+                }
                 postRefresh_App();
                 return iTrue;
             }