1 files changed, 9 insertions, 0 deletions
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index b8fdb7de..2c22a426 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -60,6 +60,10 @@ Setup::Setup():
         x -= btn->getWidth() + 5;
         btn->setPosition(x, height - btn->getHeight() - 5);
         add(btn);
+
+        // Disable this button when the windows aren't created yet
+        if (!strcmp(*curBtn, "Reset Windows"))
+            btn->setEnabled(statusWindow != NULL);
     }
 
     TabbedContainer *panel = new TabbedContainer(width, 5, 20, 45, 5, 3);
@@ -116,6 +120,11 @@ void Setup::action(const gcn::ActionEvent &event)
     }
     else if (event.getId() == "Reset Windows")
     {
+        // Bail out if this action happens to be activated before the windows
+        // are created (though it should be disabled then)
+        if (!statusWindow)
+            return;
+
         statusWindow->resetToDefaultSize();
         minimap->resetToDefaultSize();
         chatWindow->resetToDefaultSize();