1 files changed, 12 insertions, 9 deletions

diff --git a/src/models/Service.js b/src/models/Service.js
index 397950787..162dcea65 100644
--- a/src/models/Service.js
+++ b/src/models/Service.js
@@ -37,8 +37,6 @@ export default class Service {
 
   @observable isMuted = false;
 
-  @observable isHibernating = false;
-
   @observable team = '';
 
   @observable customUrl = '';
@@ -77,7 +75,7 @@ export default class Service {
 
   @observable isHibernationEnabled = false;
 
-  @observable isHibernating = false;
+  @observable isHibernationRequested = false;
 
   @observable lastUsed = Date.now(); // timestamp
 
@@ -145,14 +143,11 @@ export default class Service {
     this.recipe = recipe;
 
     // Check if "Hibernate on Startup" is enabled and hibernate all services except active one
-    const {
-      hibernate,
-      hibernateOnStartup,
-    } = window.ferdi.stores.settings.app;
+    const { hibernateOnStartup } = window.ferdi.stores.settings.app;
     // The service store is probably not loaded yet so we need to use localStorage data to get active service
     const isActive = window.localStorage.service && JSON.parse(window.localStorage.service).activeService === this.id;
-    if (hibernate && hibernateOnStartup && !isActive) {
-      this.isHibernating = true;
+    if (hibernateOnStartup && !isActive) {
+      this.isHibernationRequested = true;
     }
 
     autorun(() => {
@@ -185,6 +180,14 @@ export default class Service {
     return this.recipe.id === todosStore.todoRecipeId;
   }
 
+  @computed get canHibernate() {
+    return this.isHibernationEnabled;
+  }
+
+  @computed get isHibernating() {
+    return this.canHibernate && this.isHibernationRequested;
+  }
+
   get webview() {
     if (this.isTodosService) {
       return todosStore.webview;