Merge remote-tracking branch 'origin/4.11' into 4.12

Change-Id: I7960e0df40458d1052e14c95b5556871b50159c4
2020-03-11 07:20:16 +01:00
parent 3992e3c113 7c7c5d5a4f
commit c0704f51b2
3 changed files with 58 additions and 2 deletions
--- a/src/plugins/debugger/disassembleragent.cpp
+++ b/src/plugins/debugger/disassembleragent.cpp
@@ -238,8 +238,8 @@ void DisassemblerAgent::setLocation(const Location &loc)
        // Refresh when not displaying a function and there is not sufficient
        // context left past the address.
        if (d->cache.at(index).first.endAddress - loc.address() < 24) {
-            index = -1;
            d->cache.removeAt(index);
+            index = -1;
        }
    }
    if (index != -1) {