From 19a0071585e6a15448ad1d5a570a50a29226ac16 Mon Sep 17 00:00:00 2001
From: Dmitry Bogatov <KAction@debian.org>
Date: Tue, 27 Aug 2019 22:44:57 +0000
Subject: [PATCH] Fix one clippy::unneeded_unwrap warning

---
 src/chat.rs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/chat.rs b/src/chat.rs
index 105a215e7..7806bd6cd 100644
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -303,11 +303,8 @@ impl<'a> Chat<'a> {
                 "Cannot send message; self not in group.",
             );
         } else {
-            let from = context.sql.get_config(context, "configured_addr");
-            if from.is_none() {
-                error!(context, 0, "Cannot send message, not configured.",);
-            } else {
-                let from_c = CString::yolo(from.unwrap());
+            if let Some(from) = context.sql.get_config(context, "configured_addr") {
+                let from_c = CString::yolo(from);
                 new_rfc724_mid = dc_create_outgoing_rfc724_mid(
                     if self.typ == Chattype::Group || self.typ == Chattype::VerifiedGroup {
                         self.grpid.strdup()
@@ -529,6 +526,8 @@ impl<'a> Chat<'a> {
                         );
                     }
                 }
+            } else {
+                error!(context, 0, "Cannot send message, not configured.",);
             }
         }