From 7ada723a282b59c5d42cb2c04c6ce3e8275118b2 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Thu, 2 Feb 2017 13:51:20 +0200 Subject: [PATCH] prevent dockview crashes because screen in not set --- app/dockview.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/dockview.cpp b/app/dockview.cpp index 9a450aa5c..4e119b0d8 100644 --- a/app/dockview.cpp +++ b/app/dockview.cpp @@ -127,6 +127,10 @@ void DockView::init() void DockView::adaptToScreen(QScreen *screen) { + if (!screen | !containment()) { + return; + } + setScreen(screen); if (containment()) @@ -221,6 +225,10 @@ void DockView::showConfigurationInterface(Plasma::Applet *applet) void DockView::resizeWindow() { + if (!screen()) { + return; + } + QSize screenSize = screen()->size(); if (formFactor() == Plasma::Types::Vertical) { @@ -257,7 +265,7 @@ void DockView::updateAbsDockGeometry() void DockView::updatePosition() { - if (!containment()) + if (!screen() || !containment()) return; const QRect screenGeometry = screen()->geometry();