From be1b9b650d2dbc86ac93bcec9b89d57aa0392d7a Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Sat, 16 Dec 2023 09:10:02 -0600 Subject: [PATCH] fix: -Wnull-dereference warning in VariantHelpers::change(TrackerStat&, tr_variant*) --- qt/Application.h | 4 ++-- qt/VariantHelpers.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qt/Application.h b/qt/Application.h index a5bbd08fe..043b4487d 100644 --- a/qt/Application.h +++ b/qt/Application.h @@ -97,6 +97,8 @@ private: void quitLater() const; void notifyTorrentAdded(Torrent const*) const; + std::unordered_set interned_strings_; + std::unique_ptr prefs_; std::unique_ptr session_; std::unique_ptr model_; @@ -114,8 +116,6 @@ private: QString const config_name_ = QStringLiteral("transmission"); QString const display_name_ = QStringLiteral("transmission-qt"); - std::unordered_set interned_strings_; - #ifdef QT_DBUS_LIB QString const fdo_notifications_service_name_ = QStringLiteral("org.freedesktop.Notifications"); QString const fdo_notifications_path_ = QStringLiteral("/org/freedesktop/Notifications"); diff --git a/qt/VariantHelpers.cc b/qt/VariantHelpers.cc index 5f6e9b970..11fb26732 100644 --- a/qt/VariantHelpers.cc +++ b/qt/VariantHelpers.cc @@ -178,7 +178,7 @@ bool change(TrackerStat& setme, tr_variant const* value) changed = true; } - if (site_changed && !setme.sitename.isEmpty() && !setme.announce.isEmpty()) + if (site_changed && !setme.sitename.isEmpty() && !setme.announce.isEmpty() && trApp != nullptr) { setme.announce = trApp->intern(setme.announce); trApp->load_favicon(setme.announce);