mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2024-12-25 07:31:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed null pointer bug in DockFocusController.cpp

Browse Source
This commit is contained in:
Uwe Kindler 2021-10-11 21:20:21 +02:00
parent 87b0596ebc
commit 89aa3d5251
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/DockFocusController.cpp
View File

@ -116,7 +116,13 @@ void DockFocusControllerPrivate::updateDockWidgetFocus(CDockWidget* DockWidget)
return; return;
} }
auto Window = DockWidget->dockContainer()->window()->windowHandle(); QWindow* Window = nullptr;
auto DockContainer = DockWidget->dockContainer();
if (DockContainer)
{
Window = DockContainer->window()->windowHandle();
}
if (Window) if (Window)
{ {
Window->setProperty("FocusedDockWidget", QVariant::fromValue<CDockWidget*>(DockWidget)); Window->setProperty("FocusedDockWidget", QVariant::fromValue<CDockWidget*>(DockWidget));
@ -145,7 +151,14 @@ void DockFocusControllerPrivate::updateDockWidgetFocus(CDockWidget* DockWidget)
} }
auto NewFloatingWidget = FocusedDockWidget->dockContainer()->floatingWidget();
CFloatingDockContainer* NewFloatingWidget = nullptr;
DockContainer = FocusedDockWidget->dockContainer();
if (DockContainer)
{
NewFloatingWidget = DockContainer->floatingWidget();
}
if (NewFloatingWidget) if (NewFloatingWidget)
{ {
NewFloatingWidget->setProperty("FocusedDockWidget", QVariant::fromValue(DockWidget)); NewFloatingWidget->setProperty("FocusedDockWidget", QVariant::fromValue(DockWidget));