Attempt to unbrick Discord on macOS (#441)

powercord-org · Jan 10, 2021 · fada35c · fada35c
1 parent 3091595
commit fada35c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/Powercord/plugins/pc-codeblocks/index.js b/src/Powercord/plugins/pc-codeblocks/index.js
@@ -55,7 +55,7 @@ module.exports = class Codeblocks extends Plugin {
   }
 
   renderCodeblock (lang, lines) {
-    if (typeof hljs.getLanguage !== 'undefined') {
+    if (hljs && typeof hljs.getLanguage === 'function') {
       lang = hljs.getLanguage(lang);
     }
 

diff --git a/src/browserWindow.js b/src/browserWindow.js
@@ -30,10 +30,20 @@ class PatchedBrowserWindow extends BrowserWindow {
       originalPreload = opts.webPreferences.preload;
       // opts.webPreferences.preload = join(__dirname, './preload.js');
     } else if (opts.webPreferences && opts.webPreferences.preload) {
-      // Discord Client
       originalPreload = opts.webPreferences.preload;
-      opts.webPreferences.preload = join(__dirname, './preload.js');
-      opts.webPreferences.contextIsolation = false;
+      if (originalPreload.endsWith('splashScreenPreload.js')) {
+        /**
+         * Splash Screen on macOS (Host 0.0.262+) - I expect this to change on other platforms too!
+         * @todo: Figure out a way to theme the splash screen again, as modifying the preload script
+         * prevents Discord from launching (i.e. bricks current install, unless unplugged)
+         */
+
+        // opts.webPreferences.preload = join(__dirname, './preloadSplash.js');
+      } else {
+        // Discord Client
+        opts.webPreferences.preload = join(__dirname, './preload.js');
+        opts.webPreferences.contextIsolation = false;
+      }
 
       if (transparency) {
         opts.transparent = true;