Leaving game no longer continues to play game sounds

Especially important for observing games
Zomis · Mar 23, 2019 · f8e239d · f8e239d
1 parent 0b7e491
commit f8e239d
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/src/socketStore.js b/src/socketStore.js
@@ -194,9 +194,11 @@ export default {
       };
 
       if (type === "ADIO") {
-        let audio = audios[param]();
-        audio.volume = parseInt(localStorage.volume, 10) / 100;
-        audio.play();
+        if (context.rootState.games.activeGameId !== null) {
+          let audio = audios[param]();
+          audio.volume = parseInt(localStorage.volume, 10) / 100;
+          audio.play();
+        }
         return;
       }
       if (type === "USRK") {

diff --git a/src/views/games/ActiveGame.vue b/src/views/games/ActiveGame.vue
@@ -8,6 +8,9 @@ import { mapState } from "vuex";
 export default {
   name: "ActiveGame",
   components: { GameScreen },
+  beforeDestroy() {
+    this.$store.commit("games/leaveActiveGame");
+  },
   computed: {
     ...mapState("games", ["activeGameId"])
   }

diff --git a/src/views/games/gamesStore.js b/src/views/games/gamesStore.js
@@ -115,6 +115,9 @@ export default {
       let game = state.activeGames[data.gameId];
       gameTools.setPlayerNames(game, [data.player1, data.player2]);
     },
+    leaveActiveGame(state) {
+      state.activeGameId = null;
+    },
     newGame(state, gameInfo) {
       // Use gameId as String
       Vue.set(

diff --git a/src/views/lobby/Lobby.vue b/src/views/lobby/Lobby.vue
@@ -90,8 +90,10 @@ export default {
     ...mapState("lobby", ["messages", "onlineUsers", "lobbyGames"])
   },
   watch: {
-    activeGame() {
-      this.$router.push("/activeGame");
+    activeGame(value) {
+      if (value) {
+        this.$router.push("/activeGame");
+      }
     }
   },
   methods: {