2 files changed, 8 insertions, 3 deletions
diff --git a/saltoqd/notificationmanager.cpp b/saltoqd/notificationmanager.cpp
index 8e0e5d2..9c3a63c 100644
--- a/saltoqd/notificationmanager.cpp
+++ b/saltoqd/notificationmanager.cpp
@@ -5,14 +5,20 @@
 
 using namespace watchfish;
 
+static NotificationMonitor *monitor = 0;
+
 NotificationManager::NotificationManager(CardManager *card, ToqManager *toq) :
-	QObject(toq), _toq(toq), _monitor(NotificationMonitor::instance()),
+	QObject(toq), _toq(toq),
 	_card(card),
 	_deck(new CardDeck("com.qualcomm.qce.androidnotifications", "Notifications", this))
 {
 	_card->installDeck(_deck);
 
-	connect(_monitor, &NotificationMonitor::notification,
+	if (monitor == 0) {
+		monitor = new NotificationMonitor;
+	}
+
+	connect(monitor, &NotificationMonitor::notification,
 			this, &NotificationManager::handleNotification);
 }
 
diff --git a/saltoqd/notificationmanager.h b/saltoqd/notificationmanager.h
index 5280073..cd5a258 100644
--- a/saltoqd/notificationmanager.h
+++ b/saltoqd/notificationmanager.h
@@ -23,7 +23,6 @@ private slots:
 
 private:
 	ToqManager *_toq;
-	watchfish::NotificationMonitor *_monitor;
 	CardManager *_card;
 	CardDeck *_deck;
 	QMap<uint, Card*> _cards;