diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2020-03-10 17:05:43 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gmail.com> | 2020-03-10 17:05:43 +0000 |
| commit | 122b390bbf4bf4283ef2a94f25a44ed23ead3e05 (patch) | |
| tree | 5c34c9c362932699de65c48a27cf43ad16b389e2 | |
| parent | 1ddbbf0c0969e4b35a4a5e86a031bfec80990187 (diff) | |
| parent | ed0d2913236ef8a020748db8f9169050123e6594 (diff) | |
| download | cogl-122b390bbf4bf4283ef2a94f25a44ed23ead3e05.tar.gz | |
Merge branch 'wip/smcv/double-close' into 'cogl-1.22'
cogl-xlib-renderer: Ensure we don't close the same X display twice
See merge request GNOME/cogl!23
| -rw-r--r-- | cogl/cogl-xlib-renderer.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cogl/cogl-xlib-renderer.c b/cogl/cogl-xlib-renderer.c index 8801c1cb..8a5d8d81 100644 --- a/cogl/cogl-xlib-renderer.c +++ b/cogl/cogl-xlib-renderer.c @@ -570,7 +570,10 @@ _cogl_xlib_renderer_disconnect (CoglRenderer *renderer) renderer->outputs = NULL; if (!renderer->foreign_xdpy && xlib_renderer->xdpy) - XCloseDisplay (xlib_renderer->xdpy); + { + XCloseDisplay (xlib_renderer->xdpy); + xlib_renderer->xdpy = NULL; + } unregister_xlib_renderer (renderer); } |