From 574b78cf3164b4db19b5e5fbf192c9d860593faf Mon Sep 17 00:00:00 2001 From: link2xt Date: Sun, 10 Apr 2022 21:29:12 +0000 Subject: [PATCH] Interrupt ephemeral loop when `delete_device_after` is set --- src/config.rs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/config.rs b/src/config.rs index e21cae720..732f5e66c 100644 --- a/src/config.rs +++ b/src/config.rs @@ -5,12 +5,10 @@ use strum::{EnumProperty, IntoEnumIterator}; use strum_macros::{AsRefStr, Display, EnumIter, EnumProperty, EnumString}; use crate::blob::BlobObject; -use crate::chat::ChatId; use crate::constants::DC_VERSION_STR; use crate::context::Context; use crate::dc_tools::{dc_get_abs_path, improve_single_line_input}; use crate::events::EventType; -use crate::message::MsgId; use crate::mimefactory::RECOMMENDED_FILE_SIZE; use crate::provider::{get_provider_by_id, Provider}; @@ -293,11 +291,8 @@ impl Context { } Config::DeleteDeviceAfter => { let ret = self.sql.set_raw_config(key, value).await; - // Force chatlist reload to delete old messages immediately. - self.emit_event(EventType::MsgsChanged { - msg_id: MsgId::new(0), - chat_id: ChatId::new(0), - }); + // Interrupt ephemeral loop to delete old messages immediately. + self.interrupt_ephemeral_task().await; ret? } Config::Displayname => {