4 files changed, 16 insertions, 5 deletions
diff --git a/src/gui/widgets/tabs/debugwindowtabs.cpp b/src/gui/widgets/tabs/debugwindowtabs.cpp
index 4a600d2fd..321c3bcad 100644
--- a/src/gui/widgets/tabs/debugwindowtabs.cpp
+++ b/src/gui/widgets/tabs/debugwindowtabs.cpp
@@ -183,8 +183,10 @@ void MapDebugTab::logic()
         mXYLabel->setCaption(strprintf("%s (?, ?)", _("Player Position:")));
     }
 
-    const Map *const map = Game::instance()->getCurrentMap();
-    if ((map != nullptr) && (viewport != nullptr))
+    Game *const game = Game::instance();
+    const Map *const map = game != nullptr ? game->getCurrentMap() : nullptr;
+    if (map != nullptr &&
+        viewport != nullptr)
     {
           // Get the current mouse position
         const int mouseTileX = (viewport->mMouseX + viewport->getCameraX())
diff --git a/src/gui/windowmanager.cpp b/src/gui/windowmanager.cpp
index 62d2996c7..38141720b 100644
--- a/src/gui/windowmanager.cpp
+++ b/src/gui/windowmanager.cpp
@@ -49,6 +49,7 @@
 #include "gui/popups/textboxpopup.h"
 
 #include "gui/windows/chatwindow.h"
+#include "gui/windows/debugwindow.h"
 #include "gui/windows/didyouknowwindow.h"
 #include "gui/windows/equipmentwindow.h"
 #include "gui/windows/helpwindow.h"
@@ -144,6 +145,13 @@ void WindowManager::createWindows()
         "#Debug", ChatTabType::DEBUG);
     debugChatTab->setAllowHighlight(false);
     chatWindow->setVisible(Visible_false);
+    if (debugWindow)
+    {
+        debugWindow->scheduleDelete();
+        debugWindow = nullptr;
+    }
+    CREATEWIDGETV(debugWindow, DebugWindow,
+        "DebugDebug");
 #endif  // DYECMD
 
     CREATEWIDGETV0(textPopup, TextPopup);
@@ -187,6 +195,7 @@ void WindowManager::deleteWindows()
 
     delete2(debugChatTab);
     delete2(chatWindow);
+    delete2(debugWindow);
 #endif  // DYECMD
 
     delete2(textPopup);
diff --git a/src/gui/windows/debugwindow.cpp b/src/gui/windows/debugwindow.cpp
index 8b4144b98..e10ad1b2c 100644
--- a/src/gui/windows/debugwindow.cpp
+++ b/src/gui/windows/debugwindow.cpp
@@ -38,7 +38,7 @@
 
 DebugWindow *debugWindow = nullptr;
 
-DebugWindow::DebugWindow() :
+DebugWindow::DebugWindow(const std::string &name) :
     // TRANSLATORS: debug window name
     Window(_("Debug"), Modal_false, nullptr, "debug.xml"),
     mTabs(CREATEWIDGETR(TabbedArea, this)),
@@ -46,7 +46,7 @@ DebugWindow::DebugWindow() :
     mTargetWidget(new TargetDebugTab(this)),
     mNetWidget(new NetDebugTab(this))
 {
-    setWindowName("Debug");
+    setWindowName(name);
     if (setupWindow != nullptr)
         setupWindow->registerWindowForReset(this);
 
diff --git a/src/gui/windows/debugwindow.h b/src/gui/windows/debugwindow.h
index f39386ec8..3e13352fc 100644
--- a/src/gui/windows/debugwindow.h
+++ b/src/gui/windows/debugwindow.h
@@ -41,7 +41,7 @@ class DebugWindow final : public Window
         /**
          * Constructor.
          */
-        DebugWindow();
+        DebugWindow(const std::string &name);
 
         A_DELETE_COPY(DebugWindow)