Changing the font or tile set during character generation would cause a crash. Fixed.

[hengbandforosx/hengbandosx.git] / src / main-cocoa.m

diff --git a/src/main-cocoa.m b/src/main-cocoa.m
index 44715e1..620fe3d 100644 (file)
--- a/src/main-cocoa.m
+++ b/src/main-cocoa.m
@@ -2824,15 +2824,18 @@ static errr Term_xtra_cocoa_react(void)
            }
 
            /* Reset visuals */
-           if (arg_bigtile == use_bigtile)
+           if (arg_bigtile == use_bigtile && character_generated)
            {
                reset_visuals();
            }
        }
 
        if (arg_bigtile != use_bigtile) {
-           /* Reset visuals */
-           reset_visuals();
+           if (character_generated)
+           {
+               /* Reset visuals */
+               reset_visuals();
+           }
 
            Term_activate(angband_term[0]);
            Term_resize(angband_term[0]->wid, angband_term[0]->hgt);
@@ -4118,7 +4121,7 @@ static void play_sound(int event)
 
     NSEnableScreenUpdates();
 
-    if (mainTerm == 0 && game_in_progress) {
+    if (mainTerm == 0 && game_in_progress && character_generated) {
        /* Mimics the logic in setGraphicsMode(). */
        do_cmd_redraw();
        wakeup_event_loop();
@@ -4556,7 +4559,7 @@ static void play_sound(int event)
        arg_bigtile = TRUE;
     }
 
-    if (game_in_progress)
+    if (game_in_progress && character_generated)
     {
        if (arg_bigtile != use_bigtile) {
            Term_activate(angband_term[0]);
@@ -4610,7 +4613,8 @@ static void play_sound(int event)
     if (graphics_are_enabled()) {
        arg_bigtile = (is_on) ? FALSE : TRUE;
        /* Mimics the logic in setGraphicsMode(). */
-       if (game_in_progress && arg_bigtile != use_bigtile) {
+       if (game_in_progress && character_generated &&
+           arg_bigtile != use_bigtile) {
            Term_activate(angband_term[0]);
            Term_resize(angband_term[0]->wid, angband_term[0]->hgt);
            do_cmd_redraw();