From 8e076d4763831059573abc6fa98bd67fe3b3f3dc Mon Sep 17 00:00:00 2001 From: Adrian Klaeger Date: Sun, 14 Nov 2021 04:01:37 +0100 Subject: Fix service activation and hibernation timeout (#2224) Fixes issue #2051 --- src/stores/ServicesStore.js | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js index a34390d88..16deb91c5 100644 --- a/src/stores/ServicesStore.js +++ b/src/stores/ServicesStore.js @@ -587,7 +587,10 @@ export default class ServicesStore extends Store { const service = this.one(serviceId); for (const s of this.all) { - s.isActive = false; + if (s.isActive) { + s.lastUsed = Date.now(); + s.isActive = false; + } } service.isActive = true; this._awake({ serviceId: service.id }); @@ -624,12 +627,7 @@ export default class ServicesStore extends Store { this.allDisplayed.length, ); - for (const s of this.all) { - s.isActive = false; - } - this.allDisplayed[nextIndex].isActive = true; - - this._focusActiveService(); + this._setActive({ serviceId: this.allDisplayed[nextIndex].id }); } @action _setActivePrev() { @@ -639,12 +637,7 @@ export default class ServicesStore extends Store { this.allDisplayed.length, ); - for (const s of this.all) { - s.isActive = false; - } - this.allDisplayed[prevIndex].isActive = true; - - this._focusActiveService(); + this._setActive({ serviceId: this.allDisplayed[prevIndex].id }); } @action _setUnreadMessageCount({ serviceId, count }) { -- cgit v1.2.3-54-g00ecf