From c6ed2c0a0643fbe795aca516271d7bed3111f53d Mon Sep 17 00:00:00 2001
From: yossizap <yossizap@gmail.com>
Date: Sat, 19 Dec 2020 17:12:05 +0000
Subject: [PATCH] Ported to Rizin

---
 rizin               |  2 +-
 src/core/Cutter.cpp | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/rizin b/rizin
index 7114d3ce..646d1353 160000
--- a/rizin
+++ b/rizin
@@ -1 +1 @@
-Subproject commit 7114d3cec72e25a5ca0f7f58ec25fc195c25fc11
+Subproject commit 646d135323041e2907d5c7116a0bd97ac35f3cd1
diff --git a/src/core/Cutter.cpp b/src/core/Cutter.cpp
index bd270464..30c172a2 100644
--- a/src/core/Cutter.cpp
+++ b/src/core/Cutter.cpp
@@ -1919,7 +1919,7 @@ void CutterCore::continueBackDebug()
     }
     emit debugTaskStateChanged();
 
-    connect(debugTask.data(), &R2Task::finished, this, [this] () {
+    connect(debugTask.data(), &RizinTask::finished, this, [this] () {
         debugTask.clear();
         syncAndSeekProgramCounter();
         emit registersChanged();
@@ -2101,7 +2101,7 @@ void CutterCore::stepBackDebug()
     }
     emit debugTaskStateChanged();
 
-    connect(debugTask.data(), &R2Task::finished, this, [this] () {
+    connect(debugTask.data(), &RizinTask::finished, this, [this] () {
         debugTask.clear();
         syncAndSeekProgramCounter();
         emit debugTaskStateChanged();
@@ -2142,7 +2142,7 @@ bool CutterCore::isTraceSessionInProgress() {
     }
 
     if (currentlyEmulating) {
-        if (core->anal->esil->trace) {
+        if (core->analysis->esil->trace) {
             return true;
         } else {
             return false;
@@ -2173,7 +2173,7 @@ void CutterCore::startTraceSession()
     }
     emit debugTaskStateChanged();
 
-    connect(debugTask.data(), &R2Task::finished, this, [this] () {
+    connect(debugTask.data(), &RizinTask::finished, this, [this] () {
         if (debugTaskDialog) {
             delete debugTaskDialog;
         }
@@ -2182,7 +2182,7 @@ void CutterCore::startTraceSession()
         emit debugTaskStateChanged();
     });
 
-    debugTaskDialog = new R2TaskDialog(debugTask);
+    debugTaskDialog = new RizinTaskDialog(debugTask);
     debugTaskDialog->setBreakOnClose(true);
     debugTaskDialog->setAttribute(Qt::WA_DeleteOnClose);
     debugTaskDialog->setDesc(tr("Creating debug tracepoint..."));
@@ -2208,7 +2208,7 @@ void CutterCore::stopTraceSession()
     }
     emit debugTaskStateChanged();
 
-    connect(debugTask.data(), &R2Task::finished, this, [this] () {
+    connect(debugTask.data(), &RizinTask::finished, this, [this] () {
         if (debugTaskDialog) {
             delete debugTaskDialog;
         }
@@ -2217,7 +2217,7 @@ void CutterCore::stopTraceSession()
         emit debugTaskStateChanged();
     });
 
-    debugTaskDialog = new R2TaskDialog(debugTask);
+    debugTaskDialog = new RizinTaskDialog(debugTask);
     debugTaskDialog->setBreakOnClose(true);
     debugTaskDialog->setAttribute(Qt::WA_DeleteOnClose);
     debugTaskDialog->setDesc(tr("Stopping debug session..."));