Move plugin and display removal to finiCore and call

finiCore from main.

3 files changed, 5 insertions, 4 deletions

diff --git a/src/core.c b/src/core.c
index cadead0d..5ce5e863 100644
--- a/src/core.c
+++ b/src/core.c
@@ -160,6 +160,9 @@ initCore (void)
 void
 finiCore (void)
 {
+    while (popPlugin ());
+    while (core.displays)
+	removeDisplay (core.displays);
 }
 
 void
diff --git a/src/display.c b/src/display.c
index 13f3b771..7b512005 100644
--- a/src/display.c
+++ b/src/display.c
@@ -1876,10 +1876,6 @@ eventLoop (void)
 
     XDestroyRegion (outputRegion);
     XDestroyRegion (tmpRegion);
-
-    while (popPlugin ());
-    while (core.displays)
-	removeDisplay (core.displays);
 }
 
 static int errors = 0;
diff --git a/src/main.c b/src/main.c
index 357b5847..6bc88fb1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -446,6 +446,8 @@ main (int argc, char **argv)
     if (!disableSm)
 	closeSession ();
 
+    finiCore ();
+
     xmlCleanupParser ();
 
     if (restartSignal)