From 4532a3b8bd83905dcc47e38013bac8ff69ad2004 Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Fri, 28 May 2021 11:47:52 +0200
Subject: [PATCH] fixes for deactivating hardhat

---
 apps/remix-ide/src/app/files/remixd-handle.js | 1 -
 apps/remix-ide/src/remixAppManager.js         | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/remix-ide/src/app/files/remixd-handle.js b/apps/remix-ide/src/app/files/remixd-handle.js
index 679a27ce9a..24b9d390ad 100644
--- a/apps/remix-ide/src/app/files/remixd-handle.js
+++ b/apps/remix-ide/src/app/files/remixd-handle.js
@@ -53,7 +53,6 @@ export class RemixdHandle extends WebsocketPlugin {
   async canceled () {
     // await this.appManager.deactivatePlugin('git') // plugin call doesn't work.. see issue https://github.com/ethereum/remix-plugin/issues/342
     await this.appManager.deactivatePlugin('remixd')
-    await this.appManager.deactivatePlugin('hardhat')
   }
 
   /**
diff --git a/apps/remix-ide/src/remixAppManager.js b/apps/remix-ide/src/remixAppManager.js
index a483143ba3..e60457ad4f 100644
--- a/apps/remix-ide/src/remixAppManager.js
+++ b/apps/remix-ide/src/remixAppManager.js
@@ -53,6 +53,8 @@ export class RemixAppManager extends PluginManager {
   }
 
   async deactivatePlugin (name) {
+    const isActive = await this.isActive(name)
+    if (!isActive) return
     const [to, from] = [
       await this.getProfile(name),
       await this.getProfile(this.requestFrom)