From 730de7ce131e71fd0062ae3750e6595d53d7035d Mon Sep 17 00:00:00 2001 From: Anthony Royer <anthony.royer@uliege.be> Date: Wed, 23 Mar 2022 11:06:35 +0100 Subject: [PATCH] Another return --- src/common/GmshMessage.cpp | 40 ++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/src/common/GmshMessage.cpp b/src/common/GmshMessage.cpp index 5bdc1a0e7d..896e1298a4 100644 --- a/src/common/GmshMessage.cpp +++ b/src/common/GmshMessage.cpp @@ -485,14 +485,16 @@ void Msg::Error(const char *fmt, ...) { _errorCount++; _atLeastOneErrorInRun = 1; + } + char str[5000]; + va_list args; + va_start(args, fmt); + vsnprintf(str, sizeof(str), fmt, args); + va_end(args); + int l = strlen(str); if(str[l - 1] == '\n') str[l - 1] = '\0'; - char str[5000]; - va_list args; - va_start(args, fmt); - vsnprintf(str, sizeof(str), fmt, args); - va_end(args); - int l = strlen(str); if(str[l - 1] == '\n') str[l - 1] = '\0'; - +#pragma omp critical(MsgError) + { if(_firstError.empty()) _firstError = str; _lastError = str; @@ -522,19 +524,19 @@ void Msg::Error(const char *fmt, ...) fflush(stderr); } } + } - if(CTX::instance()->abortOnError == 2) { - #if defined(HAVE_FLTK) - if(FlGui::available()) return; // don't throw if GUI is running - #endif - throw _lastError; - } - else if(CTX::instance()->abortOnError == 3) { - throw _lastError; - } - else if(CTX::instance()->abortOnError == 4) { - Exit(1); - } + if(CTX::instance()->abortOnError == 2) { +#if defined(HAVE_FLTK) + if(FlGui::available()) return; // don't throw if GUI is running +#endif + throw _lastError; + } + else if(CTX::instance()->abortOnError == 3) { + throw _lastError; + } + else if(CTX::instance()->abortOnError == 4) { + Exit(1); } } -- GitLab