Merge branch 'develop'

3 files changed, 7 insertions, 4 deletions

diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 36e6efd4f..593bf341e 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -202,7 +202,7 @@ export default class AppStore extends Store {
     powerMonitor.on('resume', () => {
       debug('System resumed, last suspended on', this.timeSuspensionStart.toString());
 
-      if (this.timeSuspensionStart.add(10, 'm').isBefore(moment())) {
+      if (this.timeSuspensionStart.add(10, 'm').isBefore(moment()) && this.stores.settings.app.get('reloadAfterResume')) {
         debug('Reloading services, user info and features');
 
         setTimeout(() => {
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js
index ae6ba11c5..985887d2d 100644
--- a/src/stores/ServicesStore.js
+++ b/src/stores/ServicesStore.js
@@ -766,7 +766,7 @@ export default class ServicesStore extends Store {
       const isMuted = isAppMuted || service.isMuted;
 
       if (isAttached) {
-        service.webview.audioMuted = isMuted;
+        service.webview.setAudioMuted(isMuted);
       }
     });
   }
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.js
index 26e83b725..71d4e1702 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.js
@@ -1,5 +1,7 @@
 import { ipcRenderer, remote } from 'electron';
-import { action, computed, observable, reaction } from 'mobx';
+import {
+  action, computed, observable, reaction,
+} from 'mobx';
 import localStorage from 'mobx-localstorage';
 import { DEFAULT_APP_SETTINGS, FILE_SYSTEM_SETTINGS_TYPES, LOCAL_SERVER } from '../config';
 import { API } from '../environment';
@@ -12,6 +14,7 @@ const debug = require('debug')('Ferdi:SettingsStore');
 
 export default class SettingsStore extends Store {
   @observable updateAppSettingsRequest = new Request(this.api.local, 'updateAppSettings');
+
   startup = true;
 
   fileSystemSettingsTypes = FILE_SYSTEM_SETTINGS_TYPES;
@@ -103,7 +106,7 @@ export default class SettingsStore extends Store {
             // So we lock manually
             window.ferdi.stores.router.push('/auth/locked');
           }
-        })
+        });
       }
       debug('Get appSettings resolves', resp.type, resp.data);
       Object.assign(this._fileSystemSettingsCache[resp.type], resp.data);