Merge branch 'master' into flub/send-backup

This commit is contained in:
Floris Bruynooghe
2023-03-07 12:52:09 +01:00
74 changed files with 270 additions and 226 deletions

View File

@@ -353,7 +353,7 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
Ok(line) => {
// TODO: ignore "set mail_pw"
rl.add_history_entry(line.as_str())?;
let contine = Handle::current().block_on(async {
let should_continue = Handle::current().block_on(async {
match handle_cmd(line.trim(), ctx.clone(), &mut selected_chat).await {
Ok(ExitResult::Continue) => true,
Ok(ExitResult::Exit) => {
@@ -367,7 +367,7 @@ async fn start(args: Vec<String>) -> Result<(), Error> {
}
});
if !contine {
if !should_continue {
break;
}
}