diff options
author | Victor Kareh <[email protected]> | 2019-12-02 11:08:12 -0500 |
---|---|---|
committer | Victor Kareh <[email protected]> | 2019-12-06 10:11:22 -0500 |
commit | baef3d7f25bbd4665ecced218be3b4e97c4d8a02 (patch) | |
tree | 966f3c56fa8f7e258dfd36e973b39caeb2e3d378 /src/compositor/compositor-xrender.c | |
parent | 65ca099740d44e39bbda8d5955df47ce1047b459 (diff) | |
download | marco-baef3d7f25bbd4665ecced218be3b4e97c4d8a02.tar.bz2 marco-baef3d7f25bbd4665ecced218be3b4e97c4d8a02.tar.xz |
Revert "compositor: fix possible crash closing/destroying window"
This reverts commit df56628979abc17474b001c58c28c6f3637ada9d.
It causes an issue where windows remain in the background even when
being drawn in the foreground.
Diffstat (limited to 'src/compositor/compositor-xrender.c')
-rw-r--r-- | src/compositor/compositor-xrender.c | 34 |
1 files changed, 9 insertions, 25 deletions
diff --git a/src/compositor/compositor-xrender.c b/src/compositor/compositor-xrender.c index abcf51ae..dc7ac15f 100644 --- a/src/compositor/compositor-xrender.c +++ b/src/compositor/compositor-xrender.c @@ -3040,38 +3040,23 @@ xrender_end_move (MetaCompositor *compositor, #ifdef HAVE_COMPOSITE_EXTENSIONS #endif } -#endif /* 0 */ static void xrender_free_window (MetaCompositor *compositor, MetaWindow *window) { #ifdef HAVE_COMPOSITE_EXTENSIONS - MetaCompositorXRender *xrc; - MetaFrame *frame; - Window xwindow; - - xrc = (MetaCompositorXRender *) compositor; - frame = meta_window_get_frame (window); - xwindow = None; - - if (frame) - { - xwindow = meta_frame_get_xwindow (frame); - } - else - { - /* FIXME: When an undecorated window is hidden this is called, but the - * window does not get readded if it is subsequentally shown again. See: - * http://bugzilla.gnome.org/show_bug.cgi?id=504876 - */ - /* xwindow = meta_window_get_xwindow (window); */ - } - - if (xwindow != None) - destroy_win (xrc->display, xwindow, FALSE); + /* FIXME: When an undecorated window is hidden this is called, + but the window does not get readded if it is subsequentally shown again + See http://bugzilla.gnome.org/show_bug.cgi?id=504876 + + I don't *think* theres any need for this call anyway, leaving it out + does not seem to cause any side effects so far, but I should check with + someone who understands more. */ + /* destroy_win (compositor->display, window->xwindow, FALSE); */ #endif } +#endif /* 0 */ static void xrender_process_event (MetaCompositor *compositor, @@ -3375,7 +3360,6 @@ static MetaCompositor comp_info = { xrender_process_event, xrender_get_window_surface, xrender_set_active_window, - xrender_free_window, xrender_maximize_window, xrender_unmaximize_window, }; |