aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCrystalwarrior <varsash@gmail.com>2021-02-28 21:23:26 +0300
committerCrystalwarrior <varsash@gmail.com>2021-02-28 21:23:26 +0300
commit1bb93cb7c02a726c3ff37ceffbd500faf0cc69f3 (patch)
tree5e17f634096a66a8e45d3d3e093c90d57c5bcd72
parent113529450dfbe52f6c224e3115abf114f03cab76 (diff)
Fix wrong pos being picked/displayed (most likely wit) if current_side is blank (a.k.a. use character default side)
-rw-r--r--src/courtroom.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index c8d8320f..17da7522 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);
}