From 6cc5fab302f5be5fd87b91aa68a9f448b74580eb Mon Sep 17 00:00:00 2001 From: Jake Stevenson Date: Wed, 7 Sep 2016 13:29:05 -0500 Subject: [PATCH] Fix bug where disconnecting using the 'power' button, resume acted strange --- js/bufferResume.js | 4 ++-- js/glowingbear.js | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/js/bufferResume.js b/js/bufferResume.js index 2ded8d1..1af4f4e 100644 --- a/js/bufferResume.js +++ b/js/bufferResume.js @@ -47,8 +47,8 @@ bufferResume.service('bufferResume', ['settings', function(settings) { }; // Clear out the recorded info. Maybe we'll do this when the user chooses to disconnect? - resumer.clear = function() { - record(undefined); + resumer.reset = function() { + hasResumed = false; }; return resumer; diff --git a/js/glowingbear.js b/js/glowingbear.js index 35831c3..f65f770 100644 --- a/js/glowingbear.js +++ b/js/glowingbear.js @@ -260,6 +260,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout', $rootScope.$emit('notificationChanged'); $scope.connectbutton = 'Connect'; $scope.connectbuttonicon = 'glyphicon-chevron-right'; + bufferResume.reset(); }); $scope.connectbutton = 'Connect'; $scope.connectbuttonicon = 'glyphicon-chevron-right'; @@ -600,6 +601,7 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout', $scope.disconnect = function() { $scope.connectbutton = 'Connect'; $scope.connectbuttonicon = 'glyphicon-chevron-right'; + bufferResume.reset(); connection.disconnect(); }; $scope.reconnect = function() {