From 134acba91633eb01c52f3215adf9f2ee9688f319 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Fri, 4 Sep 2015 21:34:26 +0200
Subject: [PATCH] + fix switching to another mdi view when using the sketcher
 creation command from task panel

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

diff --git a/src/Gui/TaskView/TaskView.cpp b/src/Gui/TaskView/TaskView.cpp
index 95ce4f87a..e7496d9ff 100644
--- a/src/Gui/TaskView/TaskView.cpp
+++ b/src/Gui/TaskView/TaskView.cpp
@@ -593,6 +593,8 @@ void TaskView::updateWatcher(void)
     // to the mdi area which may switch to another mdi view which is not an
     // acceptable behaviour.
     QWidget *fw = QApplication::focusWidget();
+    if (!fw)
+        this->setFocus();
     QPointer<QWidget> fwp = fw;
     while (fw &&  !fw->isWindow()) {
         if (fw == this) {
@@ -666,6 +668,8 @@ void TaskView::removeTaskWatcher(void)
     // to the mdi area which may switch to another mdi view which is not an
     // acceptable behaviour.
     QWidget *fw = QApplication::focusWidget();
+    if (!fw)
+        this->setFocus();
     while (fw &&  !fw->isWindow()) {
         if (fw == this) {
             this->setFocus();