From 8bf0de03cb0849bf6b129dfd817479e8efae6529 Mon Sep 17 00:00:00 2001
From: FlashHit <56718716+FlashHit@users.noreply.github.com>
Date: Wed, 28 Sep 2022 18:45:09 +0200
Subject: [PATCH] Implement switch soldier

---
 app/popups/LogoutQuitConfirmationPopup.js | 10 ++++++++++
 app/reducers/user.js                      |  9 +++++++++
 2 files changed, 19 insertions(+)

diff --git a/app/popups/LogoutQuitConfirmationPopup.js b/app/popups/LogoutQuitConfirmationPopup.js
index 063f1b8..34ccb71 100644
--- a/app/popups/LogoutQuitConfirmationPopup.js
+++ b/app/popups/LogoutQuitConfirmationPopup.js
@@ -12,6 +12,7 @@ class LogoutQuitConfirmationPopup extends Component
                     <h1>Logout & Quit</h1>
                     <p>Are you sure you want to log out and quit?</p>
                     <a href="#" className="btn border-btn" onClick={this.onClosePopup.bind(this)}>Cancel</a>
+                    <a href="#" className="btn border-btn primary" onClick={this.onSwitchSoldier.bind(this)}>Switch Soldier</a>
                     <a href="#" className="btn border-btn primary" onClick={this.onConfirmQuit.bind(this)}>Logout & Quit</a>
                 </div>
             </div>
@@ -27,6 +28,15 @@ class LogoutQuitConfirmationPopup extends Component
         WebUI.Call('LogoutQuit');
     }
 
+    onSwitchSoldier(e)
+    {
+        if (e)
+            e.preventDefault();
+
+        this.props.closePopup();
+        WebUI.Call('LogoutPlayer');
+    }
+
     onClosePopup(e)
     {
         if (e)
diff --git a/app/reducers/user.js b/app/reducers/user.js
index 70728b6..50d6288 100644
--- a/app/reducers/user.js
+++ b/app/reducers/user.js
@@ -158,6 +158,15 @@ export default function user(state = initialState, action)
                     hashHistory.push('/main-menu');
                 }, 50);
             }
+            else if(finalState.loginStatus === LoginStatus.LOGGED_IN &&
+                finalState.playerLoginStatus === PlayerLoginStatus.LOGGED_OUT &&
+                finalState.user !== null &&
+                finalState.players !== null)
+            {
+                setTimeout(function() {
+                    hashHistory.push('/players');
+                }, 50);
+            }
 
             return finalState;
         }