From f8d16555aa91d5b932d61df1f2085a7aebe9ad59 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Mon, 2 Apr 2018 02:24:52 +0200 Subject: [PATCH] No assert but empty URL and verify if sApp has been deleted --- src/blackcore/db/databasereader.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/blackcore/db/databasereader.cpp b/src/blackcore/db/databasereader.cpp index 0fd558f37..1b6942e88 100644 --- a/src/blackcore/db/databasereader.cpp +++ b/src/blackcore/db/databasereader.cpp @@ -20,6 +20,7 @@ #include "blackmisc/logcategory.h" #include "blackmisc/logcategorylist.h" #include "blackmisc/logmessage.h" +#include "blackmisc/verify.h" #include #include @@ -503,7 +504,9 @@ namespace BlackCore CUrl CDatabaseReader::getBaseUrl(CDbFlags::DataRetrievalModeFlag mode) const { - Q_ASSERT_X(sApp, Q_FUNC_INFO, "Missing app object, URLs cannot be obtained"); + BLACK_VERIFY_X(sApp, Q_FUNC_INFO, "Missing app object, URLs cannot be obtained"); + if (!sApp) { return CUrl(); } + switch (mode) { case CDbFlags::DbReading: