From 58181dbff9df9722b24aef18645a367e73584594 Mon Sep 17 00:00:00 2001
From: Victor Berger <vberger@users.noreply.github.com>
Date: Wed, 25 Oct 2017 18:28:24 +0200
Subject: [PATCH] wayland: Fix drop order for display (#326)

---
 src/platform/linux/wayland/event_loop.rs | 6 +++---
 src/platform/linux/wayland/window.rs     | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/platform/linux/wayland/event_loop.rs b/src/platform/linux/wayland/event_loop.rs
index c35cb4fe..27c4d450 100644
--- a/src/platform/linux/wayland/event_loop.rs
+++ b/src/platform/linux/wayland/event_loop.rs
@@ -55,8 +55,6 @@ impl EventsLoopSink {
 }
 
 pub struct EventsLoop {
-    // The wayland display
-    pub display: Arc<wl_display::WlDisplay>,
     // The Event Queue
     pub evq: RefCell<EventQueue>,
     // our sink, shared with some handlers, buffering the events
@@ -70,7 +68,9 @@ pub struct EventsLoop {
     // the ctxt
     pub ctxt_token: StateToken<StateContext>,
     // a cleanup switch to prune dead windows
-    pub cleanup_needed: Arc<Mutex<bool>>
+    pub cleanup_needed: Arc<Mutex<bool>>,
+    // The wayland display
+    pub display: Arc<wl_display::WlDisplay>,
 }
 
 // A handle that can be sent across threads and used to wake up the `EventsLoop`.
diff --git a/src/platform/linux/wayland/window.rs b/src/platform/linux/wayland/window.rs
index fb73a3e7..eb48819b 100644
--- a/src/platform/linux/wayland/window.rs
+++ b/src/platform/linux/wayland/window.rs
@@ -12,13 +12,13 @@ use super::wayland_window::{DecoratedSurface, DecoratedSurfaceImplementation};
 use super::event_loop::StateContext;
 
 pub struct Window {
-    display: Arc<wl_display::WlDisplay>,
     surface: wl_surface::WlSurface,
     decorated: Arc<Mutex<DecoratedSurface>>,
     monitors: Arc<Mutex<MonitorList>>,
     ready: Arc<Mutex<bool>>,
     size: Arc<Mutex<(u32, u32)>>,
     kill_switch: (Arc<Mutex<bool>>, Arc<Mutex<bool>>),
+    display: Arc<wl_display::WlDisplay>,
 }
 
 impl Window {
@@ -309,4 +309,4 @@ fn surface_impl() -> wl_surface::Implementation<(StateToken<StateContext>, Arc<M
             guard.monitors.retain(|m| !Arc::ptr_eq(&m.info, &monitor.info));
         }
     }
-}
\ No newline at end of file
+}