From 0a041601f8a60fbc8b7f2b4b41dd6f9907ff1333 Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 23 May 2018 17:22:18 +0100 Subject: [PATCH] Update toolwindowmanger to d602babc98639c5d8206f1667f95062b2f3709fc --- qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.cpp b/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.cpp index 397a8f39f..cb7b24632 100644 --- a/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.cpp +++ b/qrenderdoc/3rdparty/toolwindowmanager/ToolWindowManager.cpp @@ -533,7 +533,7 @@ void ToolWindowManager::raiseToolWindow(QWidget *toolWindow) // if the parent is a ToolWindowManagerArea, switch tabs QWidget *parent = toolWindow->parentWidget(); ToolWindowManagerArea *area = qobject_cast(parent); - if(area == NULL) + if(area == NULL && parent) parent = parent->parentWidget(); area = qobject_cast(parent);