Remove sequences at termination.

2 files changed, 21 insertions, 0 deletions

diff --git a/src/privatescreen.h b/src/privatescreen.h
index 9ba9c4e..c31a89c 100644
--- a/src/privatescreen.h
+++ b/src/privatescreen.h
@@ -201,6 +201,8 @@ class PrivateScreen : public CoreOptions {
 
 	void removeSequence (SnStartupSequence *sequence);
 
+	void removeAllSequences ();
+
 	void setSupportingWmCheck ();
 
 	void setSupported ();
diff --git a/src/screen.cpp b/src/screen.cpp
index a0f4a48..465c2df 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -1907,6 +1907,23 @@ PrivateScreen::removeSequence (SnStartupSequence *sequence)
 }
 
 void
+PrivateScreen::removeAllSequences ()
+{
+    foreach (CompStartupSequence *s, startupSequences)
+    {
+	sn_startup_sequence_unref (s->sequence);
+	delete s;
+    }
+
+    startupSequences.clear ();
+
+    if (startupSequenceTimer.active ())
+	startupSequenceTimer.stop ();
+
+    updateStartupFeedback ();
+}
+
+void
 CompScreen::compScreenSnEvent (SnMonitorEvent *event,
 			       void           *userData)
 {
@@ -4360,6 +4377,8 @@ CompScreen::~CompScreen ()
 {
     CompPlugin  *p;
 
+    priv->removeAllSequences ();
+
     while (!priv->windows.empty ())
 	delete priv->windows.front ();