From d33b913e62ce9c5d5d0ee5d41053c3bcb79f2387 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Fri, 5 Apr 2019 03:05:14 +0200
Subject: [PATCH] Ref T592, sometimes using verify or default values instead of
 ASSERTs

---
 src/blackgui/dockwidget.cpp | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/blackgui/dockwidget.cpp b/src/blackgui/dockwidget.cpp
index e713cf935..737bfc21a 100644
--- a/src/blackgui/dockwidget.cpp
+++ b/src/blackgui/dockwidget.cpp
@@ -14,6 +14,7 @@
 #include "blackgui/stylesheetutility.h"
 #include "blackmisc/icons.h"
 #include "blackmisc/logmessage.h"
+#include "blackmisc/verify.h"
 
 #include <QCloseEvent>
 #include <QFrame>
@@ -404,6 +405,7 @@ namespace BlackGui
         this->initStatusBarAndProperties();
 
         // for the first time resize
+        BLACK_VERIFY(!m_preferredSizeWhenFloating.isNull());
         if (!m_preferredSizeWhenFloating.isNull())
         {
             m_initialDockedMinimumSize = this->minimumSize();
@@ -584,14 +586,22 @@ namespace BlackGui
 
     CDockWidgetSettings CDockWidget::getSettings() const
     {
-        Q_ASSERT_X(!this->objectName().isEmpty(), Q_FUNC_INFO, "Need object name for settings %OwnerName%");
+        if (this->objectName().isEmpty()) { return CDockWidgetSettings(); }
+
+        // we need object name for settings %OwnerName%"
         const CDockWidgetSettings s = m_settings.get();
         return s;
     }
 
     void CDockWidget::saveSettings(const CDockWidgetSettings &settings)
     {
-        Q_ASSERT_X(!this->objectName().isEmpty(), Q_FUNC_INFO, "Need object name for settings %OwnerName%");
+        BLACK_VERIFY_X(!this->objectName().isEmpty(), Q_FUNC_INFO, "Need object name for settings %OwnerName%");
+        if (this->objectName().isEmpty())
+        {
+            CStatusMessage(this).error(u"Settings cannot be saved!");
+            return;
+        }
+
         const CStatusMessage m = m_settings.setAndSave(settings);
         if (m.isFailure())
         {