Allow saving character side in update_character

This fixes "Reload theme" button resetting position.

2 files changed, 7 insertions, 4 deletions

diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index 82caddd..a199777 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -1492,7 +1492,7 @@ void Courtroom::set_pos_dropdown(QStringList pos_dropdowns)
   ui_pos_dropdown->setCurrentText(current_pos);
 }
 
-void Courtroom::update_character(int p_cid, QString char_name, bool reset_emote)
+void Courtroom::update_character(int p_cid, QString char_name, bool reset_emote, bool reset_pos)
 {
   bool newchar = m_cid != p_cid;
 
@@ -1523,7 +1523,10 @@ void Courtroom::update_character(int p_cid, QString char_name, bool reset_emote)
   }
 
   current_char = f_char;
-  set_side(ao_app->get_char_side(current_char));
+  if (reset_pos)
+  {
+    set_side(ao_app->get_char_side(current_char));
+  }
 
   set_text_color_dropdown();
 
@@ -6450,7 +6453,7 @@ void Courtroom::on_reload_theme_clicked()
 {
   set_courtroom_size();
   set_widgets();
-  update_character(m_cid, ui_iniswap_dropdown->itemText(ui_iniswap_dropdown->currentIndex()));
+  update_character(m_cid, ui_iniswap_dropdown->itemText(ui_iniswap_dropdown->currentIndex()), false, false);
   enter_courtroom();
   if (Options::getInstance().customChatboxEnabled())
   {
diff --git a/src/courtroom.h b/src/courtroom.h
index 095d0ea..6114c35 100644
--- a/src/courtroom.h
+++ b/src/courtroom.h
@@ -175,7 +175,7 @@ public:
 
   // updates character to p_cid and updates necessary ui elements
   // Optional "char_name" is the iniswap we're using
-  void update_character(int p_cid, QString char_name = QString(), bool reset_emote = false);
+  void update_character(int p_cid, QString char_name = QString(), bool reset_emote = false, bool reset_pos = true);
 
   // properly sets up some varibles: resets user state
   void enter_courtroom();