From ab321a4a7af042eed2b9cb7c82fe8345a9d7b594 Mon Sep 17 00:00:00 2001
From: David Skoland <davidskoland@gmail.com>
Date: Sat, 28 Jan 2017 14:47:23 +0100
Subject: [PATCH] misc

---
 base/themes/default/lobby_design.ini |  2 +-
 debug_functions.cpp                  |  2 +-
 lobby.cpp                            |  9 +++++----
 lobby.h                              |  4 ++--
 packet_distribution.cpp              | 13 +++++++++++--
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/base/themes/default/lobby_design.ini b/base/themes/default/lobby_design.ini
index efce59a..4806b86 100644
--- a/base/themes/default/lobby_design.ini
+++ b/base/themes/default/lobby_design.ini
@@ -1,5 +1,5 @@
 lobby = 0, 0, 517, 666
-public_servers = 46, 88, 114, 30
+publi_servers = 46, 88, 114, 30
 favorites = 164, 88, 114, 30
 refresh = 56, 381, 132, 28
 add_to_fav = 194, 381, 132, 28
diff --git a/debug_functions.cpp b/debug_functions.cpp
index a77e4ea..7206885 100644
--- a/debug_functions.cpp
+++ b/debug_functions.cpp
@@ -10,6 +10,6 @@ void call_error(QString p_message)
   msgBox->setWindowTitle("Error");
 
 
-  msgBox->setWindowModality(Qt::NonModal);
+  //msgBox->setWindowModality(Qt::NonModal);
   msgBox->show();
 }
diff --git a/lobby.cpp b/lobby.cpp
index 81c79cd..836c5ac 100644
--- a/lobby.cpp
+++ b/lobby.cpp
@@ -133,10 +133,7 @@ void Lobby::set_size_and_pos(QWidget *p_widget, QString p_identifier)
 
     if (design_ini_result.width < 0 || design_ini_result.height < 0)
     {
-      //at this point it's pretty much game over
-      //T0D0: add message box
-      qDebug() << "CRITICAL ERROR: NO SUITABLE DATA FOR SETTING " << p_identifier;
-      ao_app->quit();
+      call_error(" could not find \"" + p_identifier + "\" in lobby_design.ini");
     }
   }
 
@@ -288,6 +285,10 @@ void Lobby::on_chatfield_return_pressed()
 
 void Lobby::list_servers()
 {
+  public_servers_selected = true;
+  ui_favorites->set_image("favorites.png");
+  ui_public_servers->set_image("publicservers_selected.png");
+
   ui_server_list->clear();
 
   for (server_type i_server : ao_app->get_server_list())
diff --git a/lobby.h b/lobby.h
index 9befaae..843ad70 100644
--- a/lobby.h
+++ b/lobby.h
@@ -32,6 +32,8 @@ public:
   QString get_chatlog();
   int get_selected_server();
 
+  bool public_servers_selected = true;
+
   ~Lobby();
 
 private:
@@ -40,8 +42,6 @@ private:
   const int m_lobby_width = 517;
   const int m_lobby_height = 666;
 
-  bool public_servers_selected = true;
-
   AOImage *ui_background;
 
   AOButton *ui_public_servers;
diff --git a/packet_distribution.cpp b/packet_distribution.cpp
index ac42747..6d24278 100644
--- a/packet_distribution.cpp
+++ b/packet_distribution.cpp
@@ -143,8 +143,17 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
     QString window_title = "Attorney Online 2";
     int selected_server = w_lobby->get_selected_server();
 
-    if (selected_server >= 0 && selected_server < server_list.size())
-      window_title += ": " + server_list.at(selected_server).name;
+
+    if (w_lobby->public_servers_selected)
+    {
+      if (selected_server >= 0 && selected_server < server_list.size())
+        window_title += ": " + server_list.at(selected_server).name;
+    }
+    else
+    {
+      if (selected_server >= 0 && selected_server < favorite_list.size())
+        window_title += ": " + favorite_list.at(selected_server).name;
+    }
 
     w_courtroom->set_window_title(window_title);