masq
/
glowing-bear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #797 from torhve/syncfix 

handlers: check for active buffer
This commit is contained in:
Lorenz Hübschle-Schneider 2016-07-30 14:37:59 +02:00 committed by GitHub
parent afe03fd9ea f4257c35c3
commit f633993a93
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/handlers.js
View File

@ -306,7 +306,7 @@ weechat.factory('handlers', ['$rootScope', '$log', 'models', 'plugins', 'notific
var handleBufferTypeChanged = function(message) { var handleBufferTypeChanged = function(message) {
var obj = message.objects[0].content[0]; var obj = message.objects[0].content[0];
var buffer = obj.pointers[0]; var buffer = obj.pointers[0];
var old = models.getBuffer(buffer); //var old = models.getBuffer(buffer);
// 0 = formatted (normal); 1 = free // 0 = formatted (normal); 1 = free
buffer.bufferType = obj.type; buffer.bufferType = obj.type;
}; };
@ -350,6 +350,12 @@ weechat.factory('handlers', ['$rootScope', '$log', 'models', 'plugins', 'notific
var hotlist = message.objects[0].content; var hotlist = message.objects[0].content;
hotlist.forEach(function(l) { hotlist.forEach(function(l) {
var buffer = models.getBuffer(l.buffer); var buffer = models.getBuffer(l.buffer);
// If buffer is active in gb, but not active in WeeChat the
// hotlist in WeeChat will increase but we should ignore that
// in gb.
if (buffer.active) {
return;
}
// 1 is message // 1 is message
buffer.unread = l.count[1]; buffer.unread = l.count[1];
// 2 is private // 2 is private