From 3ba8b4bd9611bd82b251fbaf51f4b313f36f1c89 Mon Sep 17 00:00:00 2001
From: Jake Stanger <mail@jstanger.dev>
Date: Mon, 1 Apr 2024 15:37:11 +0100
Subject: [PATCH] fix: regressions introduced by #505

- Crash on startup if modules missing common options
- Crash on startup due to disable_popup incorrectly mandatory
---
 src/config/common.rs | 1 +
 src/macros.rs        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/config/common.rs b/src/config/common.rs
index fd207cfd..286e294e 100644
--- a/src/config/common.rs
+++ b/src/config/common.rs
@@ -27,6 +27,7 @@ pub struct CommonConfig {
     pub on_mouse_exit: Option<ScriptInput>,
 
     pub tooltip: Option<String>,
+    #[serde(default)]
     pub disable_popup: bool,
 }
 
diff --git a/src/macros.rs b/src/macros.rs
index cabc8a02..2e92619a 100644
--- a/src/macros.rs
+++ b/src/macros.rs
@@ -21,7 +21,7 @@ macro_rules! module_impl {
         }
 
         fn take_common(&mut self) -> $crate::config::CommonConfig {
-            self.common.take().expect("common config to exist")
+            self.common.take().unwrap_or_default()
         }
     };
 }