From 829206e921c1497d33b8c49e3df3b416158b1ee1 Mon Sep 17 00:00:00 2001
From: gabriel <furstenheim@gmail.com>
Date: Fri, 27 May 2016 21:41:57 +0200
Subject: [PATCH] Persist volume across videos

---
 renderer/main.js         | 3 ++-
 renderer/views/player.js | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/renderer/main.js b/renderer/main.js
index d0cc1987..b1e932ad 100644
--- a/renderer/main.js
+++ b/renderer/main.js
@@ -415,7 +415,8 @@ function setVolume (volume) {
   if (isCasting()) {
     Cast.setVolume(volume)
   } else {
-    state.playing.setVolume = volume
+    // Persist volume across videos
+    state.setVolume = volume
   }
 }
 
diff --git a/renderer/views/player.js b/renderer/views/player.js
index e6fb35aa..e0094a2e 100644
--- a/renderer/views/player.js
+++ b/renderer/views/player.js
@@ -51,9 +51,8 @@ function renderMedia (state) {
       mediaElement.playbackRate = state.playing.playbackRate
     }
     // Set volume
-    if (state.playing.setVolume !== null && isFinite(state.playing.setVolume)) {
-      mediaElement.volume = state.playing.setVolume
-      state.playing.setVolume = null
+    if (state.setVolume !== null && isFinite(state.setVolume)) {
+      mediaElement.volume = state.setVolume
     }
 
     // Switch to the newly added subtitle track, if available