From 44efee31d3cb6f7fcf722773f9c47f0a451a9495 Mon Sep 17 00:00:00 2001
From: Fedor <Fedor@mail.ru@>
Date: Sun, 17 Jan 2021 16:11:26 +0200
Subject: [PATCH] [Centaury] Fix bug with disabple-gmp option.

---
 application/basilisk/base/content/browser.js   | 10 ++++++----
 application/basilisk/modules/PluginContent.jsm |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/application/basilisk/base/content/browser.js b/application/basilisk/base/content/browser.js
index 41dc8f17c..c0643fd3d 100644
--- a/application/basilisk/base/content/browser.js
+++ b/application/basilisk/base/content/browser.js
@@ -23,7 +23,9 @@ Cu.import("resource://gre/modules/NotificationDB.jsm");
   ["Deprecated", "resource://gre/modules/Deprecated.jsm"],
   ["E10SUtils", "resource:///modules/E10SUtils.jsm"],
   ["FormValidationHandler", "resource:///modules/FormValidationHandler.jsm"],
+#ifdef THE_GMP
   ["GMPInstallManager", "resource://gre/modules/GMPInstallManager.jsm"],
+#endif
   ["LightweightThemeManager", "resource://gre/modules/LightweightThemeManager.jsm"],
   ["Log", "resource://gre/modules/Log.jsm"],
   ["LoginManagerParent", "resource://gre/modules/LoginManagerParent.jsm"],
@@ -1338,7 +1340,7 @@ var gBrowserInit = {
     } catch (ex) {
       Cu.reportError("Could not end startup crash tracking: " + ex);
     }
-
+#ifdef THE_GMP
     // Delay this a minute because there's no rush
     setTimeout(() => {
       this.gmpInstallManager = new GMPInstallManager();
@@ -1346,7 +1348,7 @@ var gBrowserInit = {
       // can check the log.
       this.gmpInstallManager.simpleCheckAndInstall().then(null, () => {});
     }, 1000 * 60);
-
+#endif
     // Report via telemetry whether we're able to play MP4/H.264/AAC video.
     // We suspect that some Windows users have a broken or have not installed
     // Windows Media Foundation, and we'd like to know how many. We'd also like
@@ -1514,11 +1516,11 @@ var gBrowserInit = {
       } catch (ex) {
         Cu.reportError(ex);
       }
-
+#ifdef THE_GMP
       if (this.gmpInstallManager) {
         this.gmpInstallManager.uninit();
       }
-
+#endif
       BrowserOffline.uninit();
       IndexedDBPromptHelper.uninit();
       LightweightThemeListener.uninit();
diff --git a/application/basilisk/modules/PluginContent.jsm b/application/basilisk/modules/PluginContent.jsm
index db9ab60a0..da433125f 100644
--- a/application/basilisk/modules/PluginContent.jsm
+++ b/application/basilisk/modules/PluginContent.jsm
@@ -1118,7 +1118,6 @@ PluginContent.prototype = {
       // TODO: Throw exception? How did we get here?
       return;
     }
-#endif
 
     let messageString =
       gNavigatorBundle.formatStringFromName("crashedpluginsMessage.title",
@@ -1132,4 +1131,5 @@ PluginContent.prototype = {
       this.hideNotificationBar("plugin-crashed");
     }, false);
   },
+#endif
 };