From 061c9d7f563084b7935e3c195e4a0eac675e4e23 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Wed, 21 Aug 2019 17:31:51 +0800
Subject: [PATCH] Disable plugins which have conflicts

---
 app/Services/PluginManager.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Services/PluginManager.php b/app/Services/PluginManager.php
index f8aef4be..0f0a59b2 100644
--- a/app/Services/PluginManager.php
+++ b/app/Services/PluginManager.php
@@ -107,7 +107,7 @@ class PluginManager
 
                 $plugin = new Plugin($directory, $manifest);
                 $plugins->put($name, $plugin);
-                if ($this->getUnsatisfied($plugin)->isNotEmpty()) {
+                if ($this->getUnsatisfied($plugin)->isNotEmpty() || $this->getConflicts($plugin)->isNotEmpty()) {
                     $this->disable($plugin);
                 }
                 if ($this->enabled->has($name)) {