From 6136a8d7e9d251348fa514f04d74aa19257c1e18 Mon Sep 17 00:00:00 2001
From: Eskil Queseth <eskilq@kth.se>
Date: Fri, 16 Oct 2020 02:01:22 +0200
Subject: add an error check

---
 mumd/src/state.rs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'mumd')

diff --git a/mumd/src/state.rs b/mumd/src/state.rs
index 58280cc..a9dbfc6 100644
--- a/mumd/src/state.rs
+++ b/mumd/src/state.rs
@@ -55,7 +55,6 @@ impl State {
         match command {
             Command::ChannelJoin { channel_id } => {
                 if !matches!(*self.phase_receiver().borrow(), StatePhase::Connected) {
-                    warn!("Not connected");
                     return (false, Err(Error::DisconnectedError));
                 }
                 if let Some(server) = &self.server {
@@ -71,12 +70,9 @@ impl State {
             }
             Command::ChannelList => {
                 if !matches!(*self.phase_receiver().borrow(), StatePhase::Connected) {
-                    warn!("Not connected");
                     return (false, Err(Error::DisconnectedError));
                 }
-                (
-                    false,
-                    Ok(Some(CommandResponse::ChannelList {
+                (false, Ok(Some(CommandResponse::ChannelList {
                         channels: self.server.as_ref().unwrap().channels().clone(),
                     })),
                 )
@@ -88,7 +84,6 @@ impl State {
                 accept_invalid_cert,
             } => {
                 if !matches!(*self.phase_receiver().borrow(), StatePhase::Disconnected) {
-                    warn!("Tried to connect to a server while already connected");
                     return (false, Err(Error::AlreadyConnectedError));
                 }
                 self.server = Some(Server::new());
@@ -116,7 +111,6 @@ impl State {
             }
             Command::Status => {
                 if !matches!(*self.phase_receiver().borrow(), StatePhase::Connected) {
-                    warn!("Not connected");
                     return (false, Err(Error::DisconnectedError));
                 }
                 (
@@ -128,6 +122,10 @@ impl State {
                 )
             }
             Command::ServerDisconnect => {
+                if !matches!(*self.phase_receiver().borrow(), StatePhase::Connected) {
+                    return (false, Err(Error::DisconnectedError));
+                }
+
                 self.session_id = None;
                 self.username = None;
                 self.server = None;
-- 
cgit v1.2.1