X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fcore%2FInformationManager.cxx;h=f59afa04aaf9c2e8f5f203fd8097c2ceed686b0a;hp=500f79f1406f661c2a4ac53747fa053898ff0db6;hb=8fd2be3e9b3fe259e780d9a2d62019cad8385474;hpb=f9d8bd4a0312a92a1ec3493e83996c0a99d8d1bf

diff --git a/src/core/InformationManager.cxx b/src/core/InformationManager.cxx
index 500f79f..f59afa0 100644
--- 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) {