Skip to content
Snippets Groups Projects
Commit 730de7ce authored by Anthony Royer's avatar Anthony Royer
Browse files

Another return

parent c7f305c2
No related branches found
No related tags found
No related merge requests found
...@@ -485,7 +485,7 @@ void Msg::Error(const char *fmt, ...) ...@@ -485,7 +485,7 @@ void Msg::Error(const char *fmt, ...)
{ {
_errorCount++; _errorCount++;
_atLeastOneErrorInRun = 1; _atLeastOneErrorInRun = 1;
}
char str[5000]; char str[5000];
va_list args; va_list args;
va_start(args, fmt); va_start(args, fmt);
...@@ -493,6 +493,8 @@ void Msg::Error(const char *fmt, ...) ...@@ -493,6 +493,8 @@ void Msg::Error(const char *fmt, ...)
va_end(args); va_end(args);
int l = strlen(str); if(str[l - 1] == '\n') str[l - 1] = '\0'; int l = strlen(str); if(str[l - 1] == '\n') str[l - 1] = '\0';
#pragma omp critical(MsgError)
{
if(_firstError.empty()) _firstError = str; if(_firstError.empty()) _firstError = str;
_lastError = str; _lastError = str;
...@@ -522,6 +524,7 @@ void Msg::Error(const char *fmt, ...) ...@@ -522,6 +524,7 @@ void Msg::Error(const char *fmt, ...)
fflush(stderr); fflush(stderr);
} }
} }
}
if(CTX::instance()->abortOnError == 2) { if(CTX::instance()->abortOnError == 2) {
#if defined(HAVE_FLTK) #if defined(HAVE_FLTK)
...@@ -536,7 +539,6 @@ void Msg::Error(const char *fmt, ...) ...@@ -536,7 +539,6 @@ void Msg::Error(const char *fmt, ...)
Exit(1); Exit(1);
} }
} }
}
void Msg::Warning(const char *fmt, ...) void Msg::Warning(const char *fmt, ...)
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment