From eabf46c58e788273bb5f0e66ad30543dc56c1524 Mon Sep 17 00:00:00 2001 From: Arseny Smirnov Date: Tue, 6 Mar 2018 14:43:46 +0300 Subject: [PATCH] LOG(FATAL) throws exception in emscripten GitOrigin-RevId: 9f2d585b5d85767dd73da30bbb490ae0dfa06354 --- CMakeLists.txt | 2 +- tdutils/td/utils/logging.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fafb4830d..9a004034d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -223,7 +223,7 @@ add_subdirectory(tdutils) add_subdirectory(td/generate) if (NOT CMAKE_CROSSCOMPILING) - add_custom_target(prepare_cross_compiling DEPENDS tl_generate_common tdmime_auto) + add_custom_target(prepare_cross_compiling DEPENDS tl_generate_common tdmime_auto tl_generate_json) if (TD_ENABLE_DOTNET) add_dependencies(prepare_cross_compiling generate_dotnet_api) endif() diff --git a/tdutils/td/utils/logging.cpp b/tdutils/td/utils/logging.cpp index f0e2927a7..17403ff87 100644 --- a/tdutils/td/utils/logging.cpp +++ b/tdutils/td/utils/logging.cpp @@ -178,6 +178,7 @@ class DefaultLog : public LogInterface { emscripten_log( EM_LOG_ERROR | EM_LOG_CONSOLE | EM_LOG_C_STACK | EM_LOG_JS_STACK | EM_LOG_DEMANGLE | EM_LOG_FUNC_PARAMS, "%s", slice.c_str()); + EM_ASM(throw(UTF8ToString($0)), slice.c_str()); break; case VERBOSITY_NAME(ERROR): emscripten_log(EM_LOG_ERROR | EM_LOG_CONSOLE, "%s", slice.c_str());