summaryrefslogtreecommitdiff
path: root/libsowatch/watchserver.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'libsowatch/watchserver.cpp')
-rw-r--r--libsowatch/watchserver.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/libsowatch/watchserver.cpp b/libsowatch/watchserver.cpp
index 06a8189..eaea040 100644
--- a/libsowatch/watchserver.cpp
+++ b/libsowatch/watchserver.cpp
@@ -187,11 +187,12 @@ void WatchServer::postNotification(Notification *notification)
void WatchServer::nextNotification()
{
if (!_watch->isConnected()) return;
+ if (_activeWatchlet) {
+ // Deactive active watchlet, if any.
+ deactivateActiveWatchlet();
+ }
if (!_pendingNotifications.empty()) {
Notification *n = _pendingNotifications.head();
- if (_activeWatchlet) {
- deactivateActiveWatchlet();
- }
_watch->displayNotification(n);
if (_notificationWatchlet) {
activateWatchlet(_notificationWatchlet);