Merge branch 'master' into feature/timerclock

# Conflicts:
#	include/courtroom.h

1 files changed, 8 insertions, 0 deletions

diff --git a/src/aoapplication.cpp b/src/aoapplication.cpp
index fa58ab84..34afb28e 100644
--- a/src/aoapplication.cpp
+++ b/src/aoapplication.cpp
@@ -45,6 +45,10 @@ void AOApplication::construct_lobby()
   if (is_discord_enabled())
     discord->state_lobby();
 
+  if (demo_server)
+      demo_server->deleteLater();
+  demo_server = new DemoServer();
+
   w_lobby->show();
 }
 
@@ -182,6 +186,10 @@ void AOApplication::call_announce_menu(Courtroom *court)
 void CALLBACK AOApplication::BASSreset(HSTREAM handle, DWORD channel,
                                        DWORD data, void *user)
 {
+  UNUSED(handle);
+  UNUSED(channel);
+  UNUSED(data);
+  UNUSED(user);
   doBASSreset();
 }