From 51363a320527cbc8b4be6e7b5861665e4d75cd5d Mon Sep 17 00:00:00 2001
From: Ivan Molodetskikh <yalterz@gmail.com>
Date: Thu, 10 Aug 2023 16:38:12 +0400
Subject: Make sure Display is dropped last

---
 src/main.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/main.rs')

diff --git a/src/main.rs b/src/main.rs
index f0083ae4..d259b4a0 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -33,11 +33,12 @@ pub struct LoopData {
     niri: Niri,
     display_handle: DisplayHandle,
 
-    // Last so that it's dropped after the Smithay state in Niri.
-    display: Display<Niri>,
-
     tty: Option<Tty>,
     winit: Option<Winit>,
+
+    // Last so that it's dropped after the Smithay state in Niri and related state in Tty.
+    // Otherwise it will segfault on quit.
+    display: Display<Niri>,
 }
 
 fn main() {
-- 
cgit