diff --git a/src/gui/set/console_panel.cpp b/src/gui/set/console_panel.cpp index d00d5acf..b2b92ed9 100644 --- a/src/gui/set/console_panel.cpp +++ b/src/gui/set/console_panel.cpp @@ -636,9 +636,14 @@ void ConsolePanel::exec(String const& command) { set_alpha(image, color.Alpha() / 255.0); message->bitmap = wxBitmap(image); } else { - boost::json::value jresult = mse_to_json(result, set.get(), true); - if (jresult.is_null()) message->text = result->toCode(); - else message->text = json_pretty_print(jresult); + try { + boost::json::value jresult = mse_to_json(result, set.get(), true); + if (jresult.is_null()) message->text = result->toCode(); + else message->text = json_pretty_print(jresult); + } + catch (...) { + message->text = result->toCode(); + } } messages->add_message(message); } catch (ScriptError const& e) { diff --git a/src/script/functions/json.cpp b/src/script/functions/json.cpp index 596da5b2..96d0a4ba 100644 --- a/src/script/functions/json.cpp +++ b/src/script/functions/json.cpp @@ -12,10 +12,15 @@ #include #include #include +#include +#include +#include #include #include #include #include +#include +#include #include #include