From 3ae9092226759d2abe74c7ac4b5a816ba8d59cf5 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Wed, 23 Dec 2020 20:25:23 +0100 Subject: [PATCH] Prefer native notifications instead of D-Bus on macOS --- src/main.cpp | 6 +++--- src/osd/osdbase.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index a31aeedd5..e85bbbeae 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -99,10 +99,10 @@ #include "settings/behavioursettingspage.h" #include "settings/appearancesettingspage.h" -#ifdef HAVE_DBUS -# include "osd/osddbus.h" -#elif defined(Q_OS_MACOS) +#if defined(Q_OS_MACOS) # include "osd/osdmac.h" +#elif defined(HAVE_DBUS) +# include "osd/osddbus.h" #else # include "osd/osdbase.h" #endif diff --git a/src/osd/osdbase.cpp b/src/osd/osdbase.cpp index 0ddb815c0..c2458425a 100644 --- a/src/osd/osdbase.cpp +++ b/src/osd/osdbase.cpp @@ -360,7 +360,7 @@ void OSDBase::RepeatModeChanged(PlaylistSequence::RepeatMode mode) { QString OSDBase::ReplaceMessage(const MessageType type, const QString &message, const Song &song) { -#ifndef HAVE_DBUS +#if !defined(HAVE_DBUS) || defined(Q_OS_MACOS) Q_UNUSED(type) #endif