From c4d22226d1ce969b95298d4e83ccdc62aa0b2d6f Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Sun, 20 Oct 2019 10:26:49 +0100 Subject: [PATCH] Error window: Fix "undefined string" appearing in 3rd line Caused by bad merge resolution with 71a3e834 --- src/error_gui.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/error_gui.cpp b/src/error_gui.cpp index a0e9615c39..b38c5df276 100644 --- a/src/error_gui.cpp +++ b/src/error_gui.cpp @@ -74,7 +74,7 @@ static WindowDesc _errmsg_face_desc( */ ErrorMessageData::ErrorMessageData(const ErrorMessageData &data) : duration(data.duration), textref_stack_grffile(data.textref_stack_grffile), textref_stack_size(data.textref_stack_size), - summary_msg(data.summary_msg), detailed_msg(data.detailed_msg), position(data.position), face(data.face) + summary_msg(data.summary_msg), detailed_msg(data.detailed_msg), extra_msg(data.extra_msg), position(data.position), face(data.face) { memcpy(this->textref_stack, data.textref_stack, sizeof(this->textref_stack)); memcpy(this->decode_params, data.decode_params, sizeof(this->decode_params));