Commit 27b3922e authored by yann300's avatar yann300

fix unloading the debugger

parent 610cc0f3
var TxBrowser = require('./debuggerUI/TxBrowser') var TxBrowser = require('./debuggerUI/TxBrowser')
var StepManagerUI = require('./debuggerUI/StepManager') var StepManagerUI = require('./debuggerUI/StepManager')
var VmDebugger = require('./debuggerUI/VmDebugger') var VmDebugger = require('./debuggerUI/VmDebugger')
var toaster = require('../ui/tooltip')
var Debugger = require('remix-debug').TransactionDebugger var Debugger = require('remix-debug').TransactionDebugger
...@@ -104,14 +105,12 @@ class DebuggerUI { ...@@ -104,14 +105,12 @@ class DebuggerUI {
startDebugging (blockNumber, txNumber, tx) { startDebugging (blockNumber, txNumber, tx) {
const self = this const self = this
if (this.debugger) delete this.debugger if (this.debugger) this.unLoad()
let compilers = this.registry.get('compilersartefacts').api let compilers = this.registry.get('compilersartefacts').api
let lastCompilationResult let lastCompilationResult
if (compilers['__last']) lastCompilationResult = compilers['__last'] if (compilers['__last']) lastCompilationResult = compilers['__last']
// TODO debugging with source highlight is disabled. see line 98
executionContext.detectNetwork((error, network) => { executionContext.detectNetwork((error, network) => {
let web3 let web3
if (error || !network) { if (error || !network) {
...@@ -133,6 +132,9 @@ class DebuggerUI { ...@@ -133,6 +132,9 @@ class DebuggerUI {
self.vmDebugger = new VmDebugger(this.debugger.vmDebuggerLogic) self.vmDebugger = new VmDebugger(this.debugger.vmDebuggerLogic)
self.txBrowser.setState({ blockNumber, txNumber, debugging: true }) self.txBrowser.setState({ blockNumber, txNumber, debugging: true })
self.renderDebugger() self.renderDebugger()
}).catch((error) => {
toaster(error)
this.unLoad()
}) })
}) })
} }
...@@ -170,6 +172,7 @@ class DebuggerUI { ...@@ -170,6 +172,7 @@ class DebuggerUI {
if (this.txBrowser) this.txBrowser.setState({debugging: false}) if (this.txBrowser) this.txBrowser.setState({debugging: false})
this.vmDebugger = null this.vmDebugger = null
this.stepManager = null this.stepManager = null
if (this.debugger) delete this.debugger
this.event.trigger('traceUnloaded') this.event.trigger('traceUnloaded')
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment