feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.1'

Browse Source 
Change-Id: Ia442f30f387fe9292217582260bbe79e54608810
This commit is contained in:
Orgad Shaneh
2016-08-05 11:59:28 +03:00
committed by Ulf Hermann
parent 713bc04ad4 d004203b13
commit 1853f01a5b
125 changed files with 1416 additions and 1407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -1516,12 +1516,15 @@ void CdbEngine::postFetchMemory(const MemoryViewCookie &cookie)
str << cookie.address << ' ' << cookie.length;
cmd.args = args;
cmd.callback = [this, cookie](const DebuggerResponse &response) {
if (response.resultClass == ResultDone && cookie.agent) {
if (!cookie.agent)
return;
if (response.resultClass == ResultDone) {
const QByteArray data = QByteArray::fromHex(response.data.data().toUtf8());
if (unsigned(data.size()) == cookie.length)
cookie.agent->addData(cookie.address, data);
} else {
showMessage(response.data["msg"].data(), LogWarning);
cookie.agent->addData(cookie.address, QByteArray(int(cookie.length), char()));
}
};
runCommand(cmd);