If we notify_notification_show() fails, we shouldn't play the alarm sound.

The alarm sound loops until the user dismisses it, which will never happen if we can't talk to unity-notiifications. So the outcome in this error case is that the alarm plays forever and can't be dismissed by the user. Fixes: 1295237

1 files changed, 7 insertions, 4 deletions

diff --git a/src/snap.cpp b/src/snap.cpp
index 5cf6063..899581b 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -222,7 +222,7 @@ NotifyMode get_notify_mode()
     return mode;
 }
 
-void show_notification (SnapData* data, NotifyMode mode)
+bool show_notification (SnapData* data, NotifyMode mode)
 {
     const Appointment& appointment = data->appointment;
 
@@ -242,16 +242,19 @@ void show_notification (SnapData* data, NotifyMode mode)
     }
     g_object_set_data_full(G_OBJECT(nn), "snap-data", data, snap_data_destroy_notify);
 
+    bool shown = true;
     GError * error = nullptr;
     notify_notification_show(nn, &error);
     if (error != NULL)
     {
-        g_warning("Unable to show snap decision for '%s': %s", body.c_str(), error->message);
+        g_critical("Unable to show snap decision for '%s': %s", body.c_str(), error->message);
         g_error_free(error);
         data->show(data->appointment);
+        shown = false;
     }
 
     g_free(title);
+    return shown;
 }
 
 /** 
@@ -274,8 +277,8 @@ void notify(const Appointment& appointment,
             break;
 
         default:
-            show_notification(data, NOTIFY_MODE_SNAP);
-            play_alarm_sound();
+            if (show_notification(data, NOTIFY_MODE_SNAP))
+                play_alarm_sound();
             break;
      }
 }