1 files changed, 42 insertions, 46 deletions

diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index 926ee36f0..e546850f9 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -171,6 +171,13 @@ export default class ServicesStore extends Store {
     );
 
     reaction(
+      () => this.stores.settings.app.splitColumns,
+      () => {
+        this._shareSettingsWithServiceProcess();
+      },
+    );
+
+    reaction(
       () => this.stores.settings.app.searchEngine,
       () => {
         this._shareSettingsWithServiceProcess();
@@ -580,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 });
@@ -617,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() {
@@ -632,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 }) {
@@ -655,20 +655,20 @@ export default class ServicesStore extends Store {
 
   @action _setWebviewReference({ serviceId, webview }) {
     const service = this.one(serviceId);
-
-    service.webview = webview;
-
-    if (!service.isAttached) {
-      debug('Webview is not attached, initializing');
-      service.initializeWebViewEvents({
-        handleIPCMessage: this.actions.service.handleIPCMessage,
-        openWindow: this.actions.service.openWindow,
-        stores: this.stores,
-      });
-      service.initializeWebViewListener();
+    if (service) {
+      service.webview = webview;
+
+      if (!service.isAttached) {
+        debug('Webview is not attached, initializing');
+        service.initializeWebViewEvents({
+          handleIPCMessage: this.actions.service.handleIPCMessage,
+          openWindow: this.actions.service.openWindow,
+          stores: this.stores,
+        });
+        service.initializeWebViewListener();
+      }
+      service.isAttached = true;
     }
-
-    service.isAttached = true;
   }
 
   @action _detachService({ service }) {
@@ -690,20 +690,22 @@ export default class ServicesStore extends Store {
       // TODO: add checks to not focus service when router path is /settings or /auth
       const service = this.active;
       if (service) {
-        document.title = `Ferdi - ${service.name} ${
-          service.dialogTitle ? ` - ${service.dialogTitle}` : ''
-        } ${service._webview ? `- ${service._webview.getTitle()}` : ''}`;
-        this._focusService({ serviceId: service.id });
-        if (this.stores.settings.app.splitMode && !focusEvent) {
-          setTimeout(() => {
-            document
-              .querySelector('.services__webview-wrapper.is-active')
-              .scrollIntoView({
-                behavior: 'smooth',
-                block: 'end',
-                inline: 'nearest',
-              });
-          }, 10);
+        if (service._webview) {
+          document.title = `Ferdi - ${service.name} ${
+            service.dialogTitle ? ` - ${service.dialogTitle}` : ''
+          } ${service._webview ? `- ${service._webview.getTitle()}` : ''}`;
+          this._focusService({ serviceId: service.id });
+          if (this.stores.settings.app.splitMode && !focusEvent) {
+            setTimeout(() => {
+              document
+                .querySelector('.services__webview-wrapper.is-active')
+                .scrollIntoView({
+                  behavior: 'smooth',
+                  block: 'end',
+                  inline: 'nearest',
+                });
+            }, 10);
+          }
         }
       } else {
         debug('No service is active');
@@ -797,8 +799,6 @@ export default class ServicesStore extends Store {
             options.icon = '/assets/img/notification-badge.gif';
           }
 
-          console.log(title, options);
-
           this.actions.app.notify({
             notificationId: args[0].notificationId,
             title,
@@ -1036,10 +1036,6 @@ export default class ServicesStore extends Store {
     if (!service.canHibernate) {
       return;
     }
-    if (service.isActive) {
-      debug(`Skipping service hibernation for ${service.name}`);
-      return;
-    }
 
     debug(`Hibernate ${service.name}`);