tie the stop-the-ringtone action to the notification being closed, so that it stops no matter which button was pressed.

1 files changed, 6 insertions, 2 deletions

diff --git a/src/snap.cpp b/src/snap.cpp
index f2d075a..655fc70 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -157,18 +157,21 @@ struct SnapData
 
 void on_snap_show(NotifyNotification*, gchar* /*action*/, gpointer gdata)
 {
-    stop_alarm_sound();
     auto data = static_cast<SnapData*>(gdata);
     data->show(data->appointment);
 }
 
 void on_snap_dismiss(NotifyNotification*, gchar* /*action*/, gpointer gdata)
 {
-    stop_alarm_sound();
     auto data = static_cast<SnapData*>(gdata);
     data->dismiss(data->appointment);
 }
 
+void on_snap_closed(NotifyNotification*, gpointer)
+{
+    stop_alarm_sound();
+}
+
 void snap_data_destroy_notify(gpointer gdata)
 {
      delete static_cast<SnapData*>(gdata);
@@ -188,6 +191,7 @@ void show_snap_decision(SnapData* data)
     notify_notification_set_hint_string(nn, "x-canonical-private-button-tint", "true");
     notify_notification_add_action(nn, "show", _("Show"), on_snap_show, data, nullptr);
     notify_notification_add_action(nn, "dismiss", _("Dismiss"), on_snap_dismiss, data, nullptr);
+    g_signal_connect(G_OBJECT(nn), "closed", G_CALLBACK(on_snap_closed), data);
     g_object_set_data_full(G_OBJECT(nn), "snap-data", data, snap_data_destroy_notify);
 
     GError * error = nullptr;