[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [marble] src/lib/geodata/data: - Fix .osm parsing crash regression introduced by
From:       Torsten Rahn <rahn () kde ! org>
Date:       2013-01-08 17:27:40
Message-ID: 20130108172740.3437DA6091 () git ! kde ! org
[Download RAW message or body]

Git commit 8dd234cf18488aa30bfb91832ea684fdfd39eb1b by Torsten Rahn.
Committed on 08/01/2013 at 18:26.
Pushed by rahn into branch 'master'.

- Fix .osm parsing crash regression introduced by
fb08fee2  Support relative icon paths in kml icon styles

M  +2    -1    src/lib/geodata/data/GeoDataFeature.cpp

http://commits.kde.org/marble/8dd234cf18488aa30bfb91832ea684fdfd39eb1b

diff --git a/src/lib/geodata/data/GeoDataFeature.cpp b/src/lib/geodata/data/GeoDataFeature.cpp
index d70fdda..4c97a47 100644
--- a/src/lib/geodata/data/GeoDataFeature.cpp
+++ b/src/lib/geodata/data/GeoDataFeature.cpp
@@ -640,7 +640,8 @@ const GeoDataStyle* GeoDataFeature::style() const
 void GeoDataFeature::setStyle( GeoDataStyle* style )
 {
     detach();
-    style->setParent( this );
+    if (style)
+        style->setParent( this );
     d->m_style = style;
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]