Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-19 06:46:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Don't add the webxdc twice if the setting is set twice

Browse Source
This commit is contained in:
Hocuri
2022-05-29 17:36:35 +02:00
committed by Septias
parent 55922db33c
commit d14ae03356
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/config.rs
View File

@@ -340,9 +340,15 @@ impl Context {
{ {
message::delete_msgs(self, &[MsgId::new(webxdc_message_id)]).await?; 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); 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 // the unbundled version lives at https://github.com/webxdc/webxdc_logging
let data: &[u8] = include_bytes!("../assets/webxdc_logging.xdc"); let data: &[u8] = include_bytes!("../assets/webxdc_logging.xdc");

2
src/message.rs
View File

@@ -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()) { if context.get_config(Config::DebugLogging).await? == Some(msg_id.to_u32().to_string()) {
context context
.sql .sql
.set_raw_config(Config::DebugLogging, Some("0")) .set_raw_config(Config::DebugLogging, None)
.await?; .await?;
context.debug_logging.store(0, atomic::Ordering::Relaxed); context.debug_logging.store(0, atomic::Ordering::Relaxed);
} }