Merge pull request #1595 from jellyfin/error

Fix issue with sync menu and excessive logging
jellyfin · Jul 23, 2020 · 7c24727 · 7c24727
2 parents 03ef599 + a8a85df
commit 7c24727
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/components/playback/playbackmanager.js b/src/components/playback/playbackmanager.js
@@ -72,7 +72,6 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         const now = (new Date).getTime();
 
         if (method !== reportPlaybackLastMethod || now - (reportPlaybackLastTime || 0) >= reportPlaybackLogDelay) {
-            console.debug(method + '-' + JSON.stringify(info));
             reportPlaybackLastMethod = method;
             reportPlaybackLastTime = now;
         }

diff --git a/src/components/syncPlay/groupSelectionMenu.js b/src/components/syncPlay/groupSelectionMenu.js
@@ -84,7 +84,7 @@ function showNewJoinGroupSelection (button, user, apiClient) {
             actionsheet.show(menuOptions).then(function (id) {
                 if (id == 'new-group') {
                     apiClient.createSyncPlayGroup();
-                } else {
+                } else if (id) {
                     apiClient.joinSyncPlayGroup({
                         GroupId: id,
                         PlayingItemId: playingItemId

diff --git a/src/components/syncPlay/syncPlayManager.js b/src/components/syncPlay/syncPlayManager.js
@@ -212,6 +212,7 @@ class SyncPlayManager {
         if (!this.lastPlaybackWaiting) {
             this.lastPlaybackWaiting = new Date();
         }
+
         events.trigger(this, 'waiting');
     }
 
@@ -288,6 +289,7 @@ class SyncPlayManager {
                 player.setPlaybackRate(this.localPlayerPlaybackRate);
                 this.localPlayerPlaybackRate = 1.0;
             }
+
             this.currentPlayer = null;
             this.playbackRateSupported = false;
         }
@@ -433,6 +435,7 @@ class SyncPlayManager {
                     });
                     return;
                 }
+
                 // Get playing item id
                 let playingItemId;
                 try {
@@ -619,6 +622,7 @@ class SyncPlayManager {
         if (this.currentPlayer) {
             this.currentPlayer.setPlaybackRate(1);
         }
+
         this.clearSyncIcon();
     }