From d14ae033568f0552f7de1b88fa61033d44f723ef Mon Sep 17 00:00:00 2001
From: Hocuri <hocuri@gmx.de>
Date: Sun, 29 May 2022 17:36:35 +0200
Subject: [PATCH] Don't add the webxdc twice if the setting is set twice

---
 src/config.rs  | 10 ++++++++--
 src/message.rs |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/config.rs b/src/config.rs
index d329493d7..1d75600f5 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -340,9 +340,15 @@ impl Context {
                     {
                         message::delete_msgs(self, &[MsgId::new(webxdc_message_id)]).await?;
                     }
-                    self.sql.set_raw_config(key, value).await?;
+                    self.sql.set_raw_config(key, None).await?;
                     self.debug_logging.store(0, atomic::Ordering::Relaxed);
-                } else {
+                } else if self
+                    .sql
+                    .get_raw_config_u32(Config::DebugLogging)
+                    .await?
+                    .unwrap_or(0)
+                    == 0
+                {
                     // the unbundled version lives at https://github.com/webxdc/webxdc_logging
                     let data: &[u8] = include_bytes!("../assets/webxdc_logging.xdc");
 
diff --git a/src/message.rs b/src/message.rs
index 588c3d57b..bbf618058 100644
--- a/src/message.rs
+++ b/src/message.rs
@@ -1286,7 +1286,7 @@ pub async fn delete_msgs(context: &Context, msg_ids: &[MsgId]) -> Result<()> {
         if context.get_config(Config::DebugLogging).await? == Some(msg_id.to_u32().to_string()) {
             context
                 .sql
-                .set_raw_config(Config::DebugLogging, Some("0"))
+                .set_raw_config(Config::DebugLogging, None)
                 .await?;
             context.debug_logging.store(0, atomic::Ordering::Relaxed);
         }