Merge branch 'master' into music_list_update

1 files changed, 5 insertions, 1 deletions

diff --git a/src/lobby.cpp b/src/lobby.cpp
index 6f257ce..d817266 100644
--- a/src/lobby.cpp
+++ b/src/lobby.cpp
@@ -69,7 +69,7 @@ void Lobby::set_widgets()
 
   if (f_lobby.width < 0 || f_lobby.height < 0)
   {
-    qDebug() << "W: did not find lobby width or height in " << filename;
+    qDebug() << "W: did not find lobby width or height in " << ao_app->get_theme_path(filename);
 
     // Most common symptom of bad config files and missing assets.
     call_notice(tr("It doesn't look like your client is set up correctly.\n"
@@ -173,6 +173,10 @@ void Lobby::set_size_and_pos(QWidget *p_widget, QString p_identifier)
   }
 }
 
+void Lobby::lobbyThreadHandler(QString loadingText){
+    this->set_loading_text(loadingText);
+}
+
 void Lobby::set_loading_text(QString p_text)
 {
   ui_loading_text->clear();