Move main window related code into windowmanager.

2 files changed, 7 insertions, 2 deletions

diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp
index 928098fea..f7b9a72a2 100644
--- a/src/gui/windows/minimap.cpp
+++ b/src/gui/windows/minimap.cpp
@@ -26,6 +26,7 @@
 #include "client.h"
 #include "configuration.h"
 #include "party.h"
+#include "settings.h"
 
 #include "being/localplayer.h"
 
@@ -159,7 +160,7 @@ void Minimap::setMap(const Map *const map)
             SDL_UnlockSurface(surface);
 
             mMapImage = imageHelper->load(surface);
-            mMapImage->setAlpha(client->getGuiAlpha());
+            mMapImage->setAlpha(settings.guiAlpha);
             mCustomMapImage = true;
             MSDL_FreeSurface(surface);
         }
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index 3f537344f..0e249c8cb 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -33,13 +33,16 @@
 #include "input/inputaction.h"
 
 #include "net/download.h"
+
 #include "gui/gui.h"
+#include "gui/windowmanager.h"
 
 #include "gui/fonts/font.h"
 
 #include "gui/models/serverslistmodel.h"
 
 #include "gui/widgets/checkbox.h"
+#include "gui/widgets/desktop.h"
 #include "gui/windows/editserverdialog.h"
 #include "gui/windows/logindialog.h"
 
@@ -253,7 +256,8 @@ void ServerDialog::connectToSelectedServer()
         if (mServerInfo->hostname != LoginDialog::savedPasswordKey)
         {
             LoginDialog::savedPassword.clear();
-            client->reloadWallpaper();
+            if (desktop)
+                desktop->reloadWallpaper();
         }
     }