Merge branch 'tracerestrict-sx' into jgrpp

This commit is contained in:
Jonathan G Rennison
2017-08-13 22:55:33 +01:00

View File

@@ -1389,8 +1389,7 @@ public:
switch (GetTraceRestrictTypeProperties(item).value_type) { switch (GetTraceRestrictTypeProperties(item).value_type) {
case TRVT_SLOT_INDEX_INT: { case TRVT_SLOT_INDEX_INT: {
int selected; int selected;
DropDownList *dlist = GetSlotDropDownList(this->GetOwner(), DropDownList *dlist = GetSlotDropDownList(this->GetOwner(), GetTraceRestrictValue(item), selected);
*(TraceRestrictProgram::InstructionAt(this->GetProgram()->items, this->selected_instruction - 1) + 1), selected);
if (dlist != NULL) ShowDropDownList(this, dlist, selected, TR_WIDGET_LEFT_AUX_DROPDOWN); if (dlist != NULL) ShowDropDownList(this, dlist, selected, TR_WIDGET_LEFT_AUX_DROPDOWN);
break; break;
} }