[metacity] window: move XAddToSaveSet out of second error trap

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 15da6562b3c879d00f3cff30fe2d92e697995629
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Thu Mar 2 00:16:04 2017 +0200

    window: move XAddToSaveSet out of second error trap
    
    XAddToSaveSet will generate BadMatch error for windows created in
    same process. Currently this is not a problem, but will be once
    we start managing override-redirect windows.

 src/core/window.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/core/window.c b/src/core/window.c
index aad60f4..9294d80 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -315,10 +315,10 @@ meta_window_new (MetaDisplay *display,
                     wm_state_to_string (existing_wm_state));
     }
 
-  meta_error_trap_push (display);
-
   XAddToSaveSet (display->xdisplay, xwindow);
 
+  meta_error_trap_push (display);
+
   event_mask =
     PropertyChangeMask | EnterWindowMask | LeaveWindowMask |
     FocusChangeMask | ColormapChangeMask;