Merge pull request #946 from ethereum/fixRemixdWorkspace

apps/remix-ide/src/app/files/remixd-handle.js

@@ -38,7 +38,7 @@ export class RemixdHandle extends WebsocketPlugin {
 
   deactivate () {
     if (super.socket) super.deactivate()
-    this.call('manager', 'deactivatePlugin', 'git')
+    this.appManager.deactivatePlugin('git') // plugin call doesn't work.. see issue https://github.com/ethereum/remix-plugin/issues/342
     this.locahostProvider.close((error) => {
       if (error) console.log(error)
     })
@@ -49,8 +49,8 @@ export class RemixdHandle extends WebsocketPlugin {
   }
 
   async canceled () {
-    this.call('manager', 'deactivatePlugin', 'git')
-    this.call('manager', 'deactivatePlugin', 'remixd')
+    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')
   }
 
   /**

libs/remix-ui/workspace/src/lib/remix-ui-workspace.tsx

@@ -88,6 +88,7 @@ export const Workspace = (props: WorkspaceProps) => {
 
     props.localhost.event.register('disconnected', () => {
       remixdExplorer.hide()
+      setWorkspace(props.workspaces.length > 0 ? props.workspaces[0] : NO_WORKSPACE)
     })
 
     if (props.initialWorkspace) {