From 963f497fbcc553c84868f0c3f140409d4010a244 Mon Sep 17 00:00:00 2001 From: Jason Blais Date: Mon, 2 Apr 2018 10:00:53 -0400 Subject: [PATCH 1/3] Update SettingsPage.jsx --- src/browser/components/SettingsPage.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/browser/components/SettingsPage.jsx b/src/browser/components/SettingsPage.jsx index 43b590a1..1f0f5563 100644 --- a/src/browser/components/SettingsPage.jsx +++ b/src/browser/components/SettingsPage.jsx @@ -567,8 +567,8 @@ const SettingsPage = createReactClass({ > {'Use GPU hardware acceleration'} - {'Disable this setting if you see a blank page after logging in to Mattermost.'} - {' If enabled, the Mattermost UI is rendered more efficiently but can cause stability issues for some systems.'} + {'If enabled, Mattermost UI is rendered more efficiently.'} + {' Enabling can lead to decreased stability for some systems.'} {' Setting takes affect after restarting the app.'} From 0648953317f8238bd8912d702f88e234f0825186 Mon Sep 17 00:00:00 2001 From: Jason Blais Date: Mon, 2 Apr 2018 10:01:13 -0400 Subject: [PATCH 2/3] Update defaultPreferences.js --- src/common/config/defaultPreferences.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/config/defaultPreferences.js b/src/common/config/defaultPreferences.js index 774422c0..fe8fa13f 100644 --- a/src/common/config/defaultPreferences.js +++ b/src/common/config/defaultPreferences.js @@ -15,7 +15,7 @@ const defaultPreferences = { }, showUnreadBadge: true, useSpellChecker: true, - enableHardwareAcceleration: true, + enableHardwareAcceleration: false, }; module.exports = defaultPreferences; From 400f5c7405c822f76bf23f15f3053a737dc36d16 Mon Sep 17 00:00:00 2001 From: Jason Blais Date: Mon, 2 Apr 2018 10:04:13 -0400 Subject: [PATCH 3/3] Update setting text for GPU acceleration setting --- src/browser/components/SettingsPage.jsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/browser/components/SettingsPage.jsx b/src/browser/components/SettingsPage.jsx index 1f0f5563..047177b7 100644 --- a/src/browser/components/SettingsPage.jsx +++ b/src/browser/components/SettingsPage.jsx @@ -567,8 +567,7 @@ const SettingsPage = createReactClass({ > {'Use GPU hardware acceleration'} - {'If enabled, Mattermost UI is rendered more efficiently.'} - {' Enabling can lead to decreased stability for some systems.'} + {'If enabled, Mattermost UI is rendered more efficiently but can lead to decreased stability for some systems.'} {' Setting takes affect after restarting the app.'}