Merge pull request #170 from lorenzhs/fixactivityswitch

Fix "Switch to buffer with activity" skipping buffers with notifications
12 years ago · efda3d4963
parent a28ee6033b d4a5218922
commit efda3d4963
1 changed files with 2 additions and 2 deletions
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@ -887,7 +887,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
            buffer = sortedBuffers[i];
            if (buffer.notification > 0) {
                $scope.setActiveBuffer(buffer.id);
-                break;
+                return;  // return instead of break so that the second for loop isn't executed
            }
        }
        // No notifications, find first buffer with unread lines instead
@ -895,7 +895,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
            buffer = sortedBuffers[i];
            if (buffer.unread > 0) {
                $scope.setActiveBuffer(buffer.id);
-                break;
+                return;
            }
        }
    };