Merge pull request #217 from AttorneyOnline/kfo-ao2

Final mega-merge with the Killing Fever Online client, along with other associated bugfixes and feature additions.

This commit is release-ready.

1 files changed, 4 insertions, 3 deletions

diff --git a/src/aoapplication.cpp b/src/aoapplication.cpp
index 3b5e836d..e1e9e7fe 100644
--- a/src/aoapplication.cpp
+++ b/src/aoapplication.cpp
@@ -1,12 +1,13 @@
 #include "aoapplication.h"
 
-#include "aocaseannouncerdialog.h"
-#include "aooptionsdialog.h"
 #include "courtroom.h"
 #include "debug_functions.h"
 #include "lobby.h"
 #include "networkmanager.h"
 
+#include "aocaseannouncerdialog.h"
+#include "aooptionsdialog.h"
+
 AOApplication::AOApplication(int &argc, char **argv) : QApplication(argc, argv)
 {
   // Create the QSettings class that points to the config.ini.
@@ -125,7 +126,6 @@ void AOApplication::add_favorite_server(int p_server)
 void AOApplication::server_disconnected()
 {
   if (courtroom_constructed) {
-    beep();
     call_notice(tr("Disconnected from server."));
     construct_lobby();
     destruct_courtroom();
@@ -135,6 +135,7 @@ void AOApplication::server_disconnected()
 void AOApplication::loading_cancelled()
 {
   destruct_courtroom();
+
   w_lobby->hide_loading_overlay();
 }