ch0ic3/cutter
1
0
Fork 0
mirror of https://github.com/rizinorg/cutter.git synced 2025-01-31 00:35:05 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Update radare2 and fix Cutter for it (#1890)

Browse Source
This commit is contained in:
Florian Märkl 2019-11-27 11:49:44 +01:00 committed by GitHub
parent 4dc4982b3f
commit a4e0308e84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
radare2

@ -1 +1 @@
Subproject commit dce959d2af4dd58038c63002d624aef5d7cce6f4 Subproject commit 521ac7c28f42a24586bc0b02f10feb75900a066c

6
src/common/R2Task.cpp
View File

@ -29,17 +29,17 @@ void R2Task::taskFinished()
void R2Task::startTask() void R2Task::startTask()
{ {
r_core_task_enqueue(Core()->core_, task); r_core_task_enqueue(&Core()->core_->tasks, task);
} }
void R2Task::breakTask() void R2Task::breakTask()
{ {
r_core_task_break(Core()->core_, task->id); r_core_task_break(&Core()->core_->tasks, task->id);
} }
void R2Task::joinTask() void R2Task::joinTask()
{ {
r_core_task_join(Core()->core_, nullptr, task->id); r_core_task_join(&Core()->core_->tasks, nullptr, task->id);
} }
QString R2Task::getResult() QString R2Task::getResult()

4
src/core/Cutter.cpp
View File

@ -159,7 +159,7 @@ void CutterCore::initialize()
{ {
r_cons_new(); // initialize console r_cons_new(); // initialize console
core_ = r_core_new(); core_ = r_core_new();
r_core_task_sync_begin(core_); r_core_task_sync_begin(&core_->tasks);
coreBed = r_cons_sleep_begin(); coreBed = r_cons_sleep_begin();
CORE_LOCK(); CORE_LOCK();
@ -206,7 +206,7 @@ CutterCore::~CutterCore()
{ {
delete bbHighlighter; delete bbHighlighter;
r_cons_sleep_end(coreBed); r_cons_sleep_end(coreBed);
r_core_task_sync_end(core_); r_core_task_sync_end(&core_->tasks);
r_core_free(this->core_); r_core_free(this->core_);
r_cons_free(); r_cons_free();
} }