Skip to content

Commit 24d6044

Browse files
check logging callback before logging
1 parent 5ce9db5 commit 24d6044

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

pythonfmu3/pythonfmu-export/src/cppfmu/fmi_functions.cpp

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,16 @@ fmi3Instance fmi3InstantiateCoSimulation(
110110
component->logger);
111111
return component;
112112
} catch (const cppfmu::FatalError& e) {
113-
logMessage(environment, fmi3Fatal, "", e.what());
113+
if (logMessage)
114+
{
115+
logMessage(environment, fmi3Fatal, "", e.what());
116+
}
114117
return nullptr;
115118
} catch (const std::exception& e) {
116-
logMessage(environment, fmi3Error, "", e.what());
119+
if (logMessage)
120+
{
121+
logMessage(environment, fmi3Error, "", e.what());
122+
}
117123
return nullptr;
118124
}
119125
}
@@ -143,10 +149,16 @@ fmi3Instance fmi3InstantiateModelExchange(
143149
component->logger);
144150
return component;
145151
} catch (const cppfmu::FatalError& e) {
146-
logMessage(environment, fmi3Fatal, "", e.what());
152+
if (logMessage)
153+
{
154+
logMessage(environment, fmi3Fatal, "", e.what());
155+
}
147156
return nullptr;
148157
} catch (const std::exception& e) {
149-
logMessage(environment, fmi3Error, "", e.what());
158+
if (logMessage)
159+
{
160+
logMessage(environment, fmi3Error, "", e.what());
161+
}
150162
return nullptr;
151163
}
152164

0 commit comments

Comments
 (0)