Merge pull request #263 from meetfranz/feature/mute-service

minor improvements & bugfixing
meetfranz · Nov 12, 2017 · 3c54aa3 · 3c54aa3
2 parents 48fe63a + 83ccd49
commit 3c54aa3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/config.js b/src/config.js
@@ -7,7 +7,7 @@ export const GA_ID = 'UA-74126766-6';
 export const DEFAULT_APP_SETTINGS = {
   autoLaunchOnStart: true,
   autoLaunchInBackground: false,
-  runInBackground: false,
+  runInBackground: true,
   enableSystemTray: true,
   minimizeToSystemTray: false,
   showDisabledServices: true,

diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
@@ -35,9 +35,13 @@ export default class SettingsStore extends Store {
 
   @action async _update({ settings }) {
     await this.updateSettingsRequest.execute(settings)._promise;
-    await this.allSettingsRequest.invalidate({ immediately: true });
+    this.allSettingsRequest.patch((result) => {
+      if (!result) return;
+      Object.assign(result, settings);
+    });
 
-    this._shareSettingsWithMainProcess();
+    // We need a little hack to wait until everything is patched
+    setTimeout(() => this._shareSettingsWithMainProcess(), 0);
 
     gaEvent('Settings', 'update');
   }

diff --git a/src/styles/tabs.scss b/src/styles/tabs.scss
@@ -67,8 +67,8 @@
     padding: 0px 5px;
     font-size: 11px;
     position: absolute;
-    right: 5px;
-    bottom: 5px;
+    right: 8px;
+    bottom: 8px;
     display: flex;
     justify-content: center;
     align-items: center;