diff --git a/src/blackgui/components/abouthtmlcomponent.ui b/src/blackgui/components/abouthtmlcomponent.ui
index 97ee42cf0..de400646f 100644
--- a/src/blackgui/components/abouthtmlcomponent.ui
+++ b/src/blackgui/components/abouthtmlcomponent.ui
@@ -39,7 +39,7 @@
<html><head><meta name="qrichtext" content="1" /><title>About swift</title><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.1pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8.25pt;">Credits will go here</span></p></body></html>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt;">Loading credits and legal information, be patient ......</span></p></body></html>
true
diff --git a/src/blackgui/components/interpolationsetupcomponent.cpp b/src/blackgui/components/interpolationsetupcomponent.cpp
index b51b967b4..db3ad24bc 100644
--- a/src/blackgui/components/interpolationsetupcomponent.cpp
+++ b/src/blackgui/components/interpolationsetupcomponent.cpp
@@ -54,12 +54,14 @@ namespace BlackGui
QPointer myself(this);
QTimer::singleShot(1000, this, [ = ]
{
+ if (!sGui || sGui->isShuttingDown()) { return; }
if (myself.isNull()) { return; }
this->onModeChanged();
});
QTimer::singleShot(30 * 1000, this, [ = ]
{
+ if (!sGui || sGui->isShuttingDown()) { return; }
if (myself.isNull()) { return; }
this->onSetupChanged();
});
@@ -85,6 +87,7 @@ namespace BlackGui
void CInterpolationSetupComponent::onModeChanged()
{
+ if (!sGui || sGui->isShuttingDown()) { return; }
bool enableCallsign = false;
if (this->getSetupMode() == CInterpolationSetupComponent::Global)
{
@@ -237,6 +240,7 @@ namespace BlackGui
void CInterpolationSetupComponent::onSetupChanged()
{
+ if (!sGui || sGui->isShuttingDown()) { return; }
this->displaySetupsPerCallsign();
}