From 1bb93cb7c02a726c3ff37ceffbd500faf0cc69f3 Mon Sep 17 00:00:00 2001 From: Crystalwarrior Date: Sun, 28 Feb 2021 21:23:26 +0300 Subject: [PATCH] Fix wrong pos being picked/displayed (most likely wit) if current_side is blank (a.k.a. use character default side) --- src/courtroom.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/courtroom.cpp b/src/courtroom.cpp index c8d8320..17da752 100644 --- a/src/courtroom.cpp +++ b/src/courtroom.cpp @@ -1256,9 +1256,12 @@ void Courtroom::set_background(QString p_background, bool display) ui_vp_evidence_display->reset(); ui_vp_background->kill(); ui_vp_desk->kill(); + QString f_side = current_side; + if (current_side == "") + f_side = ao_app->get_char_side(current_char); set_scene( 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 ui_pos_dropdown->blockSignals(false); - // Don't block the signals when setting side set_side(current_side); }