From 8881ef885d638e92d0c7b060fe0a7552593752d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Fri, 14 Sep 2018 09:38:39 +0200 Subject: [PATCH] Fix nullptr crash. --- YACReaderLibrary/yacreader_library_toolbar.cpp | 2 ++ YACReaderLibrary/yacreader_library_toolbar.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/YACReaderLibrary/yacreader_library_toolbar.cpp b/YACReaderLibrary/yacreader_library_toolbar.cpp index 40559f8e..423d01a0 100644 --- a/YACReaderLibrary/yacreader_library_toolbar.cpp +++ b/YACReaderLibrary/yacreader_library_toolbar.cpp @@ -143,7 +143,9 @@ void YACReaderLibraryToolbar::hide() void YACReaderLibraryToolbar::updateViewSelectorIcon(const QIcon &icon) { #ifdef Q_OS_MAC + if (macosxToolbar != nullptr) { macosxToolbar->updateViewSelectorIcon(icon); + } #endif } diff --git a/YACReaderLibrary/yacreader_library_toolbar.h b/YACReaderLibrary/yacreader_library_toolbar.h index 57d6fd2f..d55de8cf 100644 --- a/YACReaderLibrary/yacreader_library_toolbar.h +++ b/YACReaderLibrary/yacreader_library_toolbar.h @@ -46,7 +46,7 @@ private: QSettings * settings; #ifdef Q_OS_MAC - YACReaderMacOSXToolbar *macosxToolbar; + YACReaderMacOSXToolbar *macosxToolbar = nullptr; #endif YACReaderMainToolBar *defaultToolbar = nullptr;