From 49f435766b51a6d02f15886292f0f2a4fa529568 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 10 Aug 2022 05:00:16 +0300 Subject: [PATCH 9/9] 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 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/client/options.c b/client/options.c index 6825846dd5..a79e31f2bb 100644 --- a/client/options.c +++ b/client/options.c @@ -6164,7 +6164,9 @@ 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 && client.conn.playing->ai_controlled) { + if (!gui_options.ai_manual_turn_done + && client.conn.playing != NULL + && client.conn.playing->ai_controlled) { if (can_end_turn()) { user_ended_turn(); } -- 2.35.1