Only emit resetEvent if binary was succesfully loaded

[frida/frida.git] / src / core / InformationManager.cxx

diff --git a/src/core/InformationManager.cxx b/src/core/InformationManager.cxx
index 500f79f1406f661c2a4ac53747fa053898ff0db6..f59afa04aaf9c2e8f5f203fd8097c2ceed686b0a 100644 (file)
--- a/src/core/InformationManager.cxx
+++ b/src/core/InformationManager.cxx
@@ -28,6 +28,7 @@ InformationManager::InformationManager()
 }
 
 InformationManager::~InformationManager() {
+       disassemblerThread.quit();
        for (auto b : blocks)
                delete b.second;
 
@@ -36,14 +37,19 @@ InformationManager::~InformationManager() {
 
        for (auto i : plugins)
                delete i;
+       disassemblerThread.wait();
 }
 
 void InformationManager::reset(const std::string& filename) {
        this->filename = filename;
        disassembler.reset(createLLVMDisassembler(filename, this));
-       emit resetEvent();
-       if (disassembler.get() != NULL)
-               disassembler.get()->start();
+       if (disassembler.get() != NULL) {
+               emit resetEvent();
+               disassembler.get()->moveToThread(&disassemblerThread);
+               connect(&disassemblerThread, &QThread::started,
+                       disassembler.get(), &Disassembler::start);
+               disassemblerThread.start();
+       }
 }
 
 void InformationManager::load(const std::string& filename) {