From 20b3a06adf38f6cadd2acb5c66afdcd5bbcb0581 Mon Sep 17 00:00:00 2001 From: iequidoo Date: Mon, 22 Dec 2025 05:28:02 -0300 Subject: [PATCH] fix: inner_configure: Check Config::OnlyFetchMvbox before MvboxMove for multi-transport (#7637) `Config::OnlyFetchMvbox` should be checked before `MvboxMove` because the latter makes no sense in presense of `OnlyFetchMvbox` and even grayed out in the UIs in this case. Otherwise users will see an error mentioning the wrong setting. --- src/configure.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/configure.rs b/src/configure.rs index e72315e7e..282c931d3 100644 --- a/src/configure.rs +++ b/src/configure.rs @@ -272,16 +272,18 @@ impl Context { ) .await? { - if self.get_config(Config::MvboxMove).await?.as_deref() != Some("0") { - bail!( - "To use additional relays, disable the legacy option \"Settings / Advanced / Move automatically to DeltaChat Folder\"." - ); - } + // Should be checked before `MvboxMove` because the latter makes no sense in presense of + // `OnlyFetchMvbox` and even grayed out in the UIs in this case. if self.get_config(Config::OnlyFetchMvbox).await?.as_deref() != Some("0") { bail!( "To use additional relays, disable the legacy option \"Settings / Advanced / Only Fetch from DeltaChat Folder\"." ); } + if self.get_config(Config::MvboxMove).await?.as_deref() != Some("0") { + bail!( + "To use additional relays, disable the legacy option \"Settings / Advanced / Move automatically to DeltaChat Folder\"." + ); + } if self.get_config(Config::ShowEmails).await?.as_deref() != Some("2") { bail!( "To use additional relays, set the legacy option \"Settings / Advanced / Show Classic Emails\" to \"All\"."