From fc04ef21577454690e955ef737875e845538cebc Mon Sep 17 00:00:00 2001
From: Victoria Brekenfeld <victoria@system76.com>
Date: Mon, 5 Dec 2022 23:20:32 +0100
Subject: [PATCH] state: Don't crash on error due to missing logger

---
 src/main.rs  | 7 +++----
 src/state.rs | 8 --------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 088b22ea..44389877 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -27,7 +27,7 @@ pub mod debug;
 
 fn main() -> Result<()> {
     // setup logger
-    let log = logger::init_logger()?;
+    let _log = logger::init_logger()?;
     slog_scope::info!("Cosmic starting up!");
 
     // init event loop
@@ -41,7 +41,6 @@ fn main() -> Result<()> {
         socket,
         event_loop.handle(),
         event_loop.get_signal(),
-        log,
     );
     // init backend
     backend::init_backend_auto(&display.handle(), &mut event_loop, &mut state)?;
@@ -71,9 +70,9 @@ fn main() -> Result<()> {
         let _ = data.display.flush_clients();
     })?;
 
-    let _log = data.state.destroy();
-    // drop eventloop before logger
+    // drop eventloop & state before logger
     std::mem::drop(event_loop);
+    std::mem::drop(data);
 
     Ok(())
 }
diff --git a/src/state.rs b/src/state.rs
index de1d0cb1..97e65fa4 100644
--- a/src/state.rs
+++ b/src/state.rs
@@ -3,7 +3,6 @@
 use crate::{
     backend::{kms::KmsState, winit::WinitState, x11::X11State},
     config::{Config, OutputConfig},
-    logger::LogState,
     shell::Shell,
     utils::prelude::*,
     wayland::protocols::{
@@ -85,7 +84,6 @@ pub struct Common {
     pub clock: Clock<Monotonic>,
     pub should_stop: bool,
 
-    pub log: LogState,
     #[cfg(feature = "debug")]
     pub egui: Egui,
 
@@ -207,7 +205,6 @@ impl State {
         socket: OsString,
         handle: LoopHandle<'static, Data>,
         signal: LoopSignal,
-        log: LogState,
     ) -> State {
         let clock = Clock::new().expect("Failed to initialize clock");
         let config = Config::load();
@@ -251,7 +248,6 @@ impl State {
                 clock,
                 should_stop: false,
 
-                log,
                 #[cfg(feature = "debug")]
                 egui: Egui { active: false },
 
@@ -313,10 +309,6 @@ impl State {
             privileged: true,
         }
     }
-
-    pub fn destroy(self) -> LogState {
-        self.common.log
-    }
 }
 
 impl Common {