From 69c11f909d51df30cfd27be25ca93f335a47553c Mon Sep 17 00:00:00 2001 From: Dimitris Panokostas Date: Sun, 12 Jan 2025 15:07:45 +0100 Subject: [PATCH] bugfix: ShowMessage dialog could crash if custom font was used (fixes #1591) --- src/osdep/gui/ShowMessage.cpp | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/osdep/gui/ShowMessage.cpp b/src/osdep/gui/ShowMessage.cpp index be9ea25f..ac811f2b 100644 --- a/src/osdep/gui/ShowMessage.cpp +++ b/src/osdep/gui/ShowMessage.cpp @@ -186,20 +186,8 @@ static void InitShowMessage(const std::string& message) { TTF_Init(); - try - { - gui_font = new gcn::SDLTrueTypeFont(prefix_with_data_path(gui_theme.font_name), gui_theme.font_size); - gui_font->setAntiAlias(false); - gui_font->setColor(gui_font_color); - } - catch (exception& ex) - { - cout << ex.what() << '\n'; - write_log("An error occurred while trying to open the GUI font! Exception: %s\n", ex.what()); - abort(); - } - - gcn::Widget::setGlobalFont(gui_font); + load_theme(amiberry_options.gui_theme); + apply_theme(); } wndShowMessage = new gcn::Window("Message");