From b28cd641cebd9e803783abee551c1bd3d580f3b6 Mon Sep 17 00:00:00 2001
From: "Aaron J. Seigo" <aseigo@kde.org>
Date: Wed, 24 Sep 2008 21:55:37 +0000
Subject: [PATCH] more careful

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=864514
---
 private/style.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/private/style.cpp b/private/style.cpp
index c8e5e6dc3..c0d0dc602 100644
--- a/private/style.cpp
+++ b/private/style.cpp
@@ -97,7 +97,7 @@ void Style::drawComplexControl(ComplexControl control,
     d->scrollbar->resizePanel(option->rect.size());
     d->scrollbar->paintPanel(painter);
 
-    if (sunken && scrollOption->activeSubControls & SC_ScrollBarSlider) {
+    if (sunken && scrollOption && scrollOption->activeSubControls & SC_ScrollBarSlider) {
         d->scrollbar->setElementPrefix("sunken-slider");
     } else {
         d->scrollbar->setElementPrefix(prefix + "slider");
@@ -119,13 +119,13 @@ void Style::drawComplexControl(ComplexControl control,
             d->scrollbar->paint(painter, subLine.topLeft(), prefix + "arrow-left");
         }
     } else {
-        if (sunken && scrollOption->activeSubControls & SC_ScrollBarAddLine) {
+        if (sunken && scrollOption && scrollOption->activeSubControls & SC_ScrollBarAddLine) {
             d->scrollbar->paint(painter, addLine.topLeft(), "sunken-arrow-down");
         } else {
             d->scrollbar->paint(painter, addLine.topLeft(), prefix + "arrow-down");
         }
 
-        if (sunken && scrollOption->activeSubControls & SC_ScrollBarSubLine) {
+        if (sunken && scrollOption && scrollOption->activeSubControls & SC_ScrollBarSubLine) {
             d->scrollbar->paint(painter, subLine.topLeft(), "sunken-arrow-up");
         } else {
             d->scrollbar->paint(painter, subLine.topLeft(), prefix + "arrow-up");