From 3520ba282578fe170ef278cc4af83803e2530d30 Mon Sep 17 00:00:00 2001
From: Tim Jenssen <tim.jenssen@qt.io>
Date: Mon, 13 Mar 2017 15:09:11 +0100
Subject: [PATCH] QmlDesigner: simplify code

Change-Id: I3269162c25366b4a9b910ba7431eae6b05b799fa
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 src/plugins/qmldesigner/qmldesignerplugin.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp
index e5f2bc23385..c1a48b95ad7 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.cpp
+++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp
@@ -283,16 +283,15 @@ void QmlDesignerPlugin::integrateIntoQtCreator(QWidget *modeWidget)
         if (d && currentEditor && checkIfEditorIsQtQuick(currentEditor) &&
                 !documentIsAlreadyOpen(currentDesignDocument(), currentEditor, newMode)) {
 
-            if (!isDesignerMode(newMode) && isDesignerMode(oldMode))
-                hideDesigner();
-            else if (currentEditor && isDesignerMode(newMode))
+            if (isDesignerMode(newMode)) {
                 showDesigner();
-            else if (currentDesignDocument())
-                hideDesigner();
+            } else if (currentDesignDocument() ||
+                     (!isDesignerMode(newMode) && isDesignerMode(oldMode))) {
+                    hideDesigner();
+            }
         }
     });
 
-
     d->viewManager.designerActionManager().polishActions();
 }