when a Snap object is destructed, delete any active Popups that it owns. This cleaner shutdown doesn't have any effect in production, but is needed to shut down the bus cleanly in the tests.

1 files changed, 6 insertions, 1 deletions

diff --git a/include/datetime/snap.h b/include/datetime/snap.h
index 9b45b3f..1c90496 100644
--- a/include/datetime/snap.h
+++ b/include/datetime/snap.h
@@ -24,8 +24,9 @@
 #include <datetime/clock.h>
 #include <datetime/settings.h>
 
-#include <memory>
 #include <functional>
+#include <memory>
+#include <set>
 
 namespace unity {
 namespace indicator {
@@ -49,6 +50,10 @@ public:
 private:
     const std::shared_ptr<Clock> m_clock;
     const std::shared_ptr<const Settings> m_settings;
+
+    class Popup;
+    friend class Popup;
+    std::set<Popup*> m_pending;
 };
 
 } // namespace datetime