From 110dc52897a77aaff6efa33e79a8c3d1396025b7 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 3 Oct 2019 10:28:24 +0300 Subject: [PATCH] Don't crash on log calls even without integration. --- ui/integration.cpp | 4 ++++ ui/integration.h | 1 + ui/ui_log.cpp | 4 +++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ui/integration.cpp b/ui/integration.cpp index 3a29a37..be754c5 100644 --- a/ui/integration.cpp +++ b/ui/integration.cpp @@ -26,6 +26,10 @@ Integration &Integration::Instance() { return *IntegrationInstance; } +bool Integration::Exists() { + return (IntegrationInstance != nullptr); +} + void Integration::textActionsUpdated() { } diff --git a/ui/integration.h b/ui/integration.h index bcb20ef..f420a58 100644 --- a/ui/integration.h +++ b/ui/integration.h @@ -27,6 +27,7 @@ class Integration { public: static void Set(not_null instance); static Integration &Instance(); + static bool Exists(); virtual void postponeCall(FnMut &&callable) = 0; virtual void registerLeaveSubscription(not_null widget) = 0; diff --git a/ui/ui_log.cpp b/ui/ui_log.cpp index 784b958..648985e 100644 --- a/ui/ui_log.cpp +++ b/ui/ui_log.cpp @@ -11,7 +11,9 @@ namespace Ui { void WriteLogEntry(const QString &message) { - Integration::Instance().writeLogEntry(message); + if (Integration::Exists()) { + Integration::Instance().writeLogEntry(message); + } } } // namespace Ui