philipp/KDDockWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix possible nullptr dereference

Browse Source
This commit is contained in:
Sergio Martins
2022-02-11 17:42:09 +00:00
parent 85fb4ff671
commit a502a8250b
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/private/DropIndicatorOverlayInterface.cpp
View File

@@ -138,6 +138,9 @@ bool DropIndicatorOverlayInterface::dropIndicatorVisible(DropLocation dropLoc) c
const bool isTheOnlyFrame = m_hoveredFrame && m_hoveredFrame->isTheOnlyFrame();
return !isTheOnlyFrame || DockRegistry::self()->isProbablyObscured(m_hoveredFrame->window()->windowHandle(), windowBeingDragged);
} else if (dropLoc == DropLocation_Center) {
if (!m_hoveredFrame)
return false;
if (auto tabbingAllowedFunc = Config::self().tabbingAllowedFunc()) {
const DockWidgetBase::List source = windowBeingDragged->dockWidgets();
const DockWidgetBase::List target = m_hoveredFrame->dockWidgets();
@@ -146,7 +149,7 @@ bool DropIndicatorOverlayInterface::dropIndicatorVisible(DropLocation dropLoc) c
}
// Only allow to dock to center if the affinities match
return m_hoveredFrame && windowBeingDragged && DockRegistry::self()->affinitiesMatch(m_hoveredFrame->affinities(), windowBeingDragged->affinities()) && m_hoveredFrame->isDockable();
return windowBeingDragged && DockRegistry::self()->affinitiesMatch(m_hoveredFrame->affinities(), windowBeingDragged->affinities()) && m_hoveredFrame->isDockable();
} else {
qWarning() << Q_FUNC_INFO << "Unknown drop indicator location" << dropLoc;
}