From 57ce2ba858cd8f8c6a0932efc0a1edc7dac5061d Mon Sep 17 00:00:00 2001
From: "Aaron J. Seigo" <aseigo@kde.org>
Date: Fri, 9 May 2008 04:32:54 +0000
Subject: [PATCH] be careful with d->runner

svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=805665
---
 querymatch.cpp | 14 ++++++++++++--
 querymatch.h   |  2 ++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/querymatch.cpp b/querymatch.cpp
index f9a3c921f..903166565 100644
--- a/querymatch.cpp
+++ b/querymatch.cpp
@@ -73,7 +73,9 @@ class QueryMatch::Private : public QSharedData
 QueryMatch::QueryMatch(AbstractRunner *runner)
     : d(new Private(runner))
 {
-    d->id = runner->id();
+    if (d->runner) {
+        d->id = runner->id();
+    }
 //    kDebug() << "new match created";
 }
 
@@ -86,6 +88,11 @@ QueryMatch::~QueryMatch()
 {
 }
 
+bool QueryMatch::isValid() const
+{
+    return d->runner != 0;
+}
+
 QString QueryMatch::id() const
 {
     return d->id;
@@ -134,7 +141,10 @@ void QueryMatch::setData(const QVariant& data)
 
 void QueryMatch::setId(const QString &id)
 {
-    d->id = d->runner->id();
+    if (d->runner) {
+        d->id = d->runner->id();
+    }
+
 
     if (!id.isEmpty()) {
         d->id.append('_').append(id);
diff --git a/querymatch.h b/querymatch.h
index fcc82e3a4..8484c8009 100644
--- a/querymatch.h
+++ b/querymatch.h
@@ -77,6 +77,8 @@ class PLASMA_EXPORT QueryMatch
 
         ~QueryMatch();
 
+        bool isValid() const;
+
         /**
          * Sets the type of match this action represents.
          */