From b9a0699c8cd1e80b3ed2aae41aa2d3b92eb3b53d Mon Sep 17 00:00:00 2001
From: Iuri Matias <iuri.matias@gmail.com>
Date: Thu, 4 Oct 2018 16:19:53 -0400
Subject: [PATCH] move trace loading check from ui to debugger

---
 src/app/debugger/debugger/debugger.js | 4 ++++
 src/app/debugger/debuggerUI.js        | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/app/debugger/debugger/debugger.js b/src/app/debugger/debugger/debugger.js
index 3a40a4bad8..b96b094955 100644
--- a/src/app/debugger/debugger/debugger.js
+++ b/src/app/debugger/debugger/debugger.js
@@ -81,6 +81,10 @@ Debugger.prototype.debug = function (blockNumber, txNumber, tx, loadingCb) {
   const self = this
   let web3 = this.executionContext.web3()
 
+  if (this.debugger.traceManager.isLoading) {
+    return
+  }
+
   if (tx) {
     if (!tx.to) {
       tx.to = traceHelper.contractCreationToken('0')
diff --git a/src/app/debugger/debuggerUI.js b/src/app/debugger/debuggerUI.js
index 2314d2e511..5b21b8c6e7 100644
--- a/src/app/debugger/debuggerUI.js
+++ b/src/app/debugger/debuggerUI.js
@@ -113,10 +113,6 @@ class DebuggerUI {
   startDebugging (blockNumber, txNumber, tx) {
     const self = this
 
-    if (this.debugger.traceManager.isLoading) {
-      return
-    }
-
     this.transactionDebugger.debug(blockNumber, txNumber, tx, () => {
       self.stepManager = new StepManagerUI(this.transactionDebugger.step_manager)
       self.vmDebugger = new VmDebugger(this.transactionDebugger.vmDebuggerLogic)