From 92de92d5caf200e509091c7addd87cfc83a20aed Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Mon, 25 Oct 2021 13:00:25 -0500
Subject: [PATCH] Fix for crashing on skin select

---
 scripts/client/skin-select.js | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/scripts/client/skin-select.js b/scripts/client/skin-select.js
index 930a37e9..228568fa 100644
--- a/scripts/client/skin-select.js
+++ b/scripts/client/skin-select.js
@@ -51,16 +51,24 @@ function processSkinSelectKeyPress(keyCode) {
             } else {
                 skinSelectorIndex++;
             }
+            logToConsole(LOG_DEBUG, `Switching to skin ${allowedSkins[getGame()][skinSelectorIndex][1]} (Index: ${skinSelectorIndex}, Skin: ${allowedSkins[getGame()][skinSelectorIndex][0]})`);
             skinSelectMessageTextTop = allowedSkins[getGame()][skinSelectorIndex][1];
             localPlayer.skin = allowedSkins[getGame()][skinSelectorIndex][0];
+            localPlayer.position = skinSelectPosition;
+            localPlayer.heading = skinSelectHeading;
+            localPlayer.clearObjective();
         } else if(keyCode == SDLK_LEFT || keyCode == SDLK_a) {
             if(skinSelectorIndex <= 0) {
                 skinSelectorIndex = allowedSkins[getGame()].length-1;
             } else {
                 skinSelectorIndex--;
             }
+            logToConsole(LOG_DEBUG, `Switching to skin ${allowedSkins[getGame()][skinSelectorIndex][1]} (Index: ${skinSelectorIndex}, Skin: ${allowedSkins[getGame()][skinSelectorIndex][0]})`);
             skinSelectMessageTextTop = allowedSkins[getGame()][skinSelectorIndex][1];
             localPlayer.skin = allowedSkins[getGame()][skinSelectorIndex][0];
+            localPlayer.position = skinSelectPosition;
+            localPlayer.heading = skinSelectHeading;
+            localPlayer.clearObjective();
         } else if(keyCode == SDLK_RETURN) {
             triggerNetworkEvent("vrr.skinSelected", skinSelectorIndex);
         } else if(keyCode == SDLK_BACKSPACE) {
@@ -79,14 +87,11 @@ function processSkinSelectRendering() {
                 skinSelectMessageFontBottom.render(skinSelectMessageTextBottom, [0, game.height-65], game.width, 0.5, 0.0, skinSelectMessageFontBottom.size, skinSelectMessageColourBottom, true, true, false, true);
             //}
         }
-
-        localPlayer.position = skinSelectPosition;
-        localPlayer.heading = skinSelectHeading;
-        if(getMultiplayerMod() == VRR_MPMOD_GTAC) {
-            if(gta.game == GAME_GTA_III || gta.game == GAME_GTA_VC) {
-                localPlayer.clearObjective();
-            }
-        }
+        //if(getMultiplayerMod() == VRR_MPMOD_GTAC) {
+        //    if(gta.game == GAME_GTA_III || gta.game == GAME_GTA_VC) {
+        //        localPlayer.clearObjective();
+        //   }
+        //}
     }
 }