2 files changed, 9 insertions, 4 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index e441111a9..1d8b45872 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -290,11 +290,14 @@ void Gui::videoResized()
 {
     WindowContainer *top = static_cast<WindowContainer*>(getTop());
 
-    int oldWidth = top->getWidth();
-    int oldHeight = top->getHeight();
+    if (top)
+    {
+        int oldWidth = top->getWidth();
+        int oldHeight = top->getHeight();
 
-    top->setSize(mainGraphics->mWidth, mainGraphics->mHeight);
-    top->adjustAfterResize(oldWidth, oldHeight);
+        top->setSize(mainGraphics->mWidth, mainGraphics->mHeight);
+        top->adjustAfterResize(oldWidth, oldHeight);
+    }
 }
 
 void Gui::setUseCustomCursor(bool customCursor)
diff --git a/src/gui/widgets/windowcontainer.cpp b/src/gui/widgets/windowcontainer.cpp
index ce218e042..9e698ffa6 100644
--- a/src/gui/widgets/windowcontainer.cpp
+++ b/src/gui/widgets/windowcontainer.cpp
@@ -48,6 +48,8 @@ void WindowContainer::adjustAfterResize(int oldScreenWidth,
                                         int oldScreenHeight)
 {
     for (WidgetListIterator i = mWidgets.begin(); i != mWidgets.end(); ++i)
+    {
         if (Window *window = dynamic_cast<Window*>(*i))
             window->adjustPositionAfterResize(oldScreenWidth, oldScreenHeight);
+    }
 }