1 files changed, 4 insertions, 11 deletions
diff --git a/src/core/display.c b/src/core/display.c
index 647581f5..f07a4e69 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -936,7 +936,7 @@ meta_display_close (MetaDisplay *display,
 meta_compositor_destroy (display->compositor);
 
 g_free (display);
- display = NULL;
+ the_display = NULL;
 
 meta_quit (META_EXIT_SUCCESS);
 }
@@ -4954,13 +4954,10 @@ process_selection_clear (MetaDisplay *display,
 meta_verbose ("Got selection clear for screen %d on display %s\n",
 screen->number, display->name);
 
- meta_display_unmanage_screen (&display, 
+ meta_display_unmanage_screen (display, 
 screen,
 event->xselectionclear.time);
 
- if (!display)
- the_display = NULL;
-
 /* display and screen may both be invalid memory... */
 
 return;
@@ -4982,11 +4979,10 @@ process_selection_clear (MetaDisplay *display,
 }
 
 void
-meta_display_unmanage_screen (MetaDisplay **displayp,
+meta_display_unmanage_screen (MetaDisplay *display,
 MetaScreen *screen,
 guint32 timestamp)
 {
- MetaDisplay *display = *displayp;
 
 meta_verbose ("Unmanaging screen %d on display %s\n",
 screen->number, display->name);
@@ -4997,10 +4993,7 @@ meta_display_unmanage_screen (MetaDisplay **displayp,
 display->screens = g_slist_remove (display->screens, screen);
 
 if (display->screens == NULL)
- {
- meta_display_close (display, timestamp);
- *displayp = NULL;
- }
+ meta_display_close (display, timestamp);
 }
 
 void