From a932911c56346b6f75ac406f7d406110949867af Mon Sep 17 00:00:00 2001
From: Remi Reuvekamp <remi@remireuvekamp.nl>
Date: Wed, 11 Mar 2020 16:09:31 +0100
Subject: [PATCH] Fix #142

Don't disconnect when trying to reconnect and receiving a ErrAlreadyLoggedIn as a result.
---
 commands.go     |  7 ++++---
 provisioning.go | 13 +++++++------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/commands.go b/commands.go
index 3d326ec..252248c 100644
--- a/commands.go
+++ b/commands.go
@@ -247,12 +247,13 @@ func (handler *CommandHandler) CommandReconnect(ce *CommandEvent) {
 	} else if err == whatsapp.ErrLoginInProgress {
 		ce.Reply("A login or reconnection is already in progress.")
 		return
+	} else if err == whatsapp.ErrAlreadyLoggedIn {
+		ce.Reply("You were already connected.")
+		return
 	}
 	if err != nil {
 		ce.User.log.Warnln("Error while reconnecting:", err)
-		if err == whatsapp.ErrAlreadyLoggedIn {
-			ce.Reply("You were already connected.")
-		} else if err.Error() == "restore session connection timed out" {
+		if err.Error() == "restore session connection timed out" {
 			ce.Reply("Reconnection timed out. Is WhatsApp on your phone reachable?")
 		} else {
 			ce.Reply("Unknown error while reconnecting: %v", err)
diff --git a/provisioning.go b/provisioning.go
index 19d68ce..51fbb97 100644
--- a/provisioning.go
+++ b/provisioning.go
@@ -178,15 +178,16 @@ func (prov *ProvisioningAPI) Reconnect(w http.ResponseWriter, r *http.Request) {
 			ErrCode: "login in progress",
 		})
 		return
+	} else if err == whatsapp.ErrAlreadyLoggedIn {
+		jsonResponse(w, http.StatusConflict, Error{
+			Error:   "You were already connected.",
+			ErrCode: err.Error(),
+		})
+		return
 	}
 	if err != nil {
 		user.log.Warnln("Error while reconnecting:", err)
-		if err == whatsapp.ErrAlreadyLoggedIn {
-			jsonResponse(w, http.StatusConflict, Error{
-				Error:   "You were already connected.",
-				ErrCode: err.Error(),
-			})
-		} else if err.Error() == "restore session connection timed out" {
+		if err.Error() == "restore session connection timed out" {
 			jsonResponse(w, http.StatusForbidden, Error{
 				Error:   "Reconnection timed out. Is WhatsApp on your phone reachable?",
 				ErrCode: err.Error(),