From 2e14552a503cb67d72cca2e01bd6d1888045d85e Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Sun, 31 May 2015 17:29:30 +0200
Subject: [PATCH] + fixes #0002134: FreeCAD crashes when the window is restored
 and a plot is shown

---
 src/Gui/MainWindow.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Gui/MainWindow.cpp b/src/Gui/MainWindow.cpp
index e146abcb0..f4c75d985 100644
--- a/src/Gui/MainWindow.cpp
+++ b/src/Gui/MainWindow.cpp
@@ -1462,8 +1462,8 @@ void MainWindow::changeEvent(QEvent *e)
         if (isActiveWindow()) {
             QMdiSubWindow* mdi = d->mdiArea->currentSubWindow();
             if (mdi) {
-                MDIView* view =dynamic_cast<MDIView*>(mdi->widget());
-                if (getMainWindow()->activeWindow() != view) {
+                MDIView* view = dynamic_cast<MDIView*>(mdi->widget());
+                if (view && getMainWindow()->activeWindow() != view) {
                     d->activeView = view;
                     Application::Instance->viewActivated(view);
                 }