From e578e7b5c3854d15b1077dac3392fa4c1a9c8f23 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Sat, 6 Aug 2022 10:06:57 +0300 Subject: [PATCH 48/48] Fix crash when non-player changes ai_manual_turn_done This could happen in pre-game, or for global observer. See osdn #45310 Signed-off-by: Marko Lindqvist --- client/options.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/client/options.c b/client/options.c index 59f8b6bce3..4c18cd5f0d 100644 --- a/client/options.c +++ b/client/options.c @@ -6225,8 +6225,12 @@ static void view_option_changed_callback(struct option *poption) static void manual_turn_done_callback(struct option *poption) { update_turn_done_button_state(); - if (!gui_options.ai_manual_turn_done && is_ai(client.conn.playing)) { - if (can_end_turn()) { + + if (!gui_options.ai_manual_turn_done) { + struct player *pplayer = client_player(); + + if (pplayer != NULL && is_ai(pplayer) + && can_end_turn()) { user_ended_turn(); } } -- 2.35.1