summaryrefslogtreecommitdiff
path: root/src/core/main.c
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2012-08-01 08:33:31 -0700
committerStefano Karapetsas <[email protected]>2012-08-01 08:33:31 -0700
commita32218e8141e13dc83d88ddf5e11afe1dc8fbd4f (patch)
tree1440f14f950a36dc2689cf3e76ec08534897d159 /src/core/main.c
parent4877f47e6d29289e49a4e1b4a12e8b736711678c (diff)
parentd97bf7aab0358d423cfc2b3a00079662fc821dff (diff)
downloadmarco-a32218e8141e13dc83d88ddf5e11afe1dc8fbd4f.tar.bz2
marco-a32218e8141e13dc83d88ddf5e11afe1dc8fbd4f.tar.xz
Merge pull request #6 from NiceandGently/master
apply Should-set-RestartStyleHint-to-RestartIfRunning-wh.patch for issue #2
Diffstat (limited to 'src/core/main.c')
-rw-r--r--src/core/main.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/main.c b/src/core/main.c
index 38c69b0a..94d56917 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -362,12 +362,11 @@ static void
meta_finalize (void)
{
MetaDisplay *display = meta_get_display();
-
- meta_session_shutdown ();
-
if (display)
meta_display_close (display,
CurrentTime); /* I doubt correct timestamps matter here */
+
+ meta_session_shutdown ();
}
static int sigterm_pipe_fds[2] = { -1, -1 };