Fix graph jump color

This commit is contained in:
xarkes 2017-10-12 14:14:33 +02:00
parent 3c9e3be550
commit 822d088f52

View File

@ -1557,22 +1557,25 @@ void DisassemblerGraphView::loadCurrentGraph()
for (QJsonValueRef blockRef : func["blocks"].toArray()) { for (QJsonValueRef blockRef : func["blocks"].toArray()) {
QJsonObject block = blockRef.toObject(); QJsonObject block = blockRef.toObject();
duint e; duint fail;
duint jump;
/* Parse Block data */ /* Parse Block data */
Block b; Block b;
b.entry = block["offset"].toInt(); b.entry = block["offset"].toInt();
e = block["fail"].toInt(); fail = block["fail"].toInt();
if (e) if (fail)
{ {
b.false_path = e; b.false_path = fail;
b.exits.push_back(e); b.exits.push_back(fail);
} }
e = block["jump"].toInt(); jump = block["jump"].toInt();
if (e) if (jump)
{ {
b.true_path = e; if (fail) {
b.exits.push_back(e); b.true_path = jump;
}
b.exits.push_back(jump);
} }
for (QJsonValueRef opRef : block["ops"].toArray()) { for (QJsonValueRef opRef : block["ops"].toArray()) {
@ -1894,7 +1897,7 @@ void DisassemblerGraphView::colorsUpdatedSlot()
backgroundColor = QColor(220, 240, 255); backgroundColor = QColor(220, 240, 255);
disassemblySelectionColor = Qt::yellow; disassemblySelectionColor = Qt::yellow;
jmpColor = Qt::cyan; jmpColor = Qt::blue;
brtrueColor = Qt::green; brtrueColor = Qt::green;
brfalseColor = Qt::red; brfalseColor = Qt::red;
/*disassemblyBackgroundColor = ConfigColor("GraphNodeBackgroundColor"); /*disassemblyBackgroundColor = ConfigColor("GraphNodeBackgroundColor");