From 0cd026057235122150be0f1eb4c72e5f5902a447 Mon Sep 17 00:00:00 2001
From: Benjamin Auder <benjamin.auder@somewhere>
Date: Thu, 20 Feb 2020 21:59:30 +0100
Subject: [PATCH] Fixes

---
 client/src/views/Hall.vue     | 8 ++++++--
 client/src/views/Problems.vue | 5 +++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/client/src/views/Hall.vue b/client/src/views/Hall.vue
index a39cd548..033659bc 100644
--- a/client/src/views/Hall.vue
+++ b/client/src/views/Hall.vue
@@ -799,9 +799,10 @@ export default {
           // c.to == this.st.user.name (connected)
           if (c.fen) {
             const parsedFen = V.ParseFen(c.fen);
+            c.mycolor = V.GetOppCol(parsedFen.turn);
             this.tchallDiag = getDiagram({
               position: parsedFen.position,
-              orientation: V.GetOppCol(parsedFen.turn)
+              orientation: c.mycolor
             });
             this.curChallToAccept = c;
             document.getElementById("modalAccept").checked = true;
@@ -831,7 +832,10 @@ export default {
       let gameInfo = {
         id: getRandString(),
         fen: c.fen || V.GenRandInitFen(),
-        players: shuffle([c.from, c.seat]), //white then black
+        // White player index 0, black player index 1:
+        players: c.mycolor
+          ? (c.mycolor == "w" ? [c.seat, c.from] : [c.from, c.seat])
+          : shuffle([c.from, c.seat]),
         vid: c.vid,
         cadence: c.cadence
       };
diff --git a/client/src/views/Problems.vue b/client/src/views/Problems.vue
index 3a700eab..1c990649 100644
--- a/client/src/views/Problems.vue
+++ b/client/src/views/Problems.vue
@@ -306,15 +306,16 @@ export default {
           if (edit) {
             let editedP = this.problems.find(p => p.id == this.curproblem.id);
             this.copyProblem(this.curproblem, editedP);
-          } //new problem
+          }
           else {
+            // New problem
             let newProblem = Object.assign({}, this.curproblem);
             newProblem.id = ret.id;
             newProblem.uid = this.st.user.id;
             newProblem.uname = this.st.user.name;
             this.problems = this.problems.concat(newProblem);
+            this.resetCurProb();
           }
-          this.resetCurProb();
           this.infoMsg = "";
         }
       );
-- 
2.44.0