From ad079377fb9fb0dee0c1812a9becf6b084474eee Mon Sep 17 00:00:00 2001
From: Ben Wallis <atomyc@gmail.com>
Date: Tue, 31 Aug 2021 17:21:13 +0100
Subject: [PATCH] Fixed egui maintain() running when only F3 debug is toggled
 rather than only when F7 is toggled

---
 voxygen/src/run.rs                | 5 +----
 voxygen/src/session/mod.rs        | 2 +-
 voxygen/src/settings/interface.rs | 5 +++++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/voxygen/src/run.rs b/voxygen/src/run.rs
index 9ba998f158..2a3627820e 100644
--- a/voxygen/src/run.rs
+++ b/voxygen/src/run.rs
@@ -196,10 +196,7 @@ fn handle_main_events_cleared(
             last.render(&mut drawer, &global_state.settings);
 
             #[cfg(feature = "egui-ui")]
-            if last.egui_enabled()
-                && global_state.settings.interface.toggle_debug
-                && global_state.settings.interface.toggle_egui_debug
-            {
+            if last.egui_enabled() && global_state.settings.interface.egui_enabled() {
                 drawer.draw_egui(&mut global_state.egui_state.platform, scale_factor);
             }
         };
diff --git a/voxygen/src/session/mod.rs b/voxygen/src/session/mod.rs
index 07114633fb..1525325568 100644
--- a/voxygen/src/session/mod.rs
+++ b/voxygen/src/session/mod.rs
@@ -1043,7 +1043,7 @@ impl PlayState for SessionState {
 
             // Maintain egui (debug interface)
             #[cfg(feature = "egui-ui")]
-            if global_state.settings.interface.toggle_debug {
+            if global_state.settings.interface.egui_enabled() {
                 global_state.egui_state.maintain(
                     &self.client.borrow(),
                     &mut self.scene,
diff --git a/voxygen/src/settings/interface.rs b/voxygen/src/settings/interface.rs
index 673caa753a..84a87656f1 100644
--- a/voxygen/src/settings/interface.rs
+++ b/voxygen/src/settings/interface.rs
@@ -81,3 +81,8 @@ impl Default for InterfaceSettings {
         }
     }
 }
+
+#[cfg(feature = "egui-ui")]
+impl InterfaceSettings {
+    pub fn egui_enabled(&self) -> bool { self.toggle_debug && self.toggle_egui_debug }
+}