1 files changed, 4 insertions, 2 deletions

diff --git a/common/resourceaccess.cpp b/common/resourceaccess.cpp
index 84c5dcb..c05d06c 100644
--- a/common/resourceaccess.cpp
+++ b/common/resourceaccess.cpp
@@ -421,10 +421,12 @@ bool ResourceAccess::processMessageBuffer()
 
 void ResourceAccess::callCallbacks(int id)
 {
-    for(auto handler : d->resultHandler.values(id)) {
+    //We remove the callbacks first because the handler can kill resourceaccess directly
+    const auto callbacks = d->resultHandler.values(id);
+    d->resultHandler.remove(id);
+    for(auto handler : callbacks) {
         handler(0, QString());
     }
-    d->resultHandler.remove(id);
 }
 
 void ResourceAccess::log(const QString &message)