Merge pull request #324 from meetfranz/feature/beta-14-bugfixing

Beta 14 bugfixing

2 files changed, 11 insertions, 3 deletions

diff --git a/src/index.js b/src/index.js
index e21666086..6a08e5e5a 100644
--- a/src/index.js
+++ b/src/index.js
@@ -39,7 +39,9 @@ if (isSecondInstance) {
 
 // Lets disable Hardware Acceleration until we have a better solution
 // to deal with the high-perf-gpu requirement of some services
-app.disableHardwareAcceleration();
+
+// Disabled to test tweetdeck glitches
+// app.disableHardwareAcceleration();
 
 // Initialize Settings
 const settings = new Settings();
diff --git a/src/stores/AppStore.js b/src/stores/AppStore.js
index 14bdab094..3eb2c38d2 100644
--- a/src/stores/AppStore.js
+++ b/src/stores/AppStore.js
@@ -127,16 +127,22 @@ export default class AppStore extends Store {
 
     // Set active the next service
     key(
-      '⌘+pagedown, ctrl+pagedown, ⌘+tab, ctrl+tab', () => {
+      '⌘+pagedown, ctrl+pagedown, ⌘+alt+right, ctrl+tab', () => {
         this.actions.service.setActiveNext();
       });
 
     // Set active the prev service
     key(
-      '⌘+pageup, ctrl+pageup, ⌘+shift+tab, ctrl+shift+tab', () => {
+      '⌘+pageup, ctrl+pageup, ⌘+alt+left, ctrl+shift+tab', () => {
         this.actions.service.setActivePrev();
       });
 
+    // Global Mute 
+    key(
+      '⌘+shift+m ctrl+shift+m', () => {
+        this.actions.app.toggleMuteApp();
+      });
+
     this.locale = this._getDefaultLocale();
 
     this._healthCheck();