Fix wrong pos being picked/displayed (most likely wit) if current_side is blank (a.k.a. use character default side)
This commit is contained in:
parent
113529450d
commit
1bb93cb7c0
@ -1256,9 +1256,12 @@ void Courtroom::set_background(QString p_background, bool display)
|
|||||||
ui_vp_evidence_display->reset();
|
ui_vp_evidence_display->reset();
|
||||||
ui_vp_background->kill();
|
ui_vp_background->kill();
|
||||||
ui_vp_desk->kill();
|
ui_vp_desk->kill();
|
||||||
|
QString f_side = current_side;
|
||||||
|
if (current_side == "")
|
||||||
|
f_side = ao_app->get_char_side(current_char);
|
||||||
set_scene(
|
set_scene(
|
||||||
QString::number(ao_app->get_desk_mod(current_char, current_emote)),
|
QString::number(ao_app->get_desk_mod(current_char, current_emote)),
|
||||||
current_side);
|
f_side);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1318,7 +1321,6 @@ void Courtroom::set_pos_dropdown(QStringList pos_dropdowns)
|
|||||||
|
|
||||||
// Unblock the signals so the element can be used for setting pos again
|
// Unblock the signals so the element can be used for setting pos again
|
||||||
ui_pos_dropdown->blockSignals(false);
|
ui_pos_dropdown->blockSignals(false);
|
||||||
// Don't block the signals when setting side
|
|
||||||
set_side(current_side);
|
set_side(current_side);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user