summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan B. C. Engelen <jbc.engelen@swissonline.ch>2014-03-24 19:58:19 +0000
committerJohan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl>2014-03-24 19:58:19 +0000
commitc12885a05f335fea74ba4239e3d0bebe220cee8d (patch)
tree808f1b3ddc62695cb31282605ab32d784f2decd5
parentnoop: code legibilty (diff)
downloadinkscape-c12885a05f335fea74ba4239e3d0bebe220cee8d.tar.gz
inkscape-c12885a05f335fea74ba4239e3d0bebe220cee8d.zip
spobject: extra careful, check that repr is not nullptr
(bzr r13198)
-rwxr-xr-xmingwenv.bat2
-rw-r--r--src/sp-object.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/mingwenv.bat b/mingwenv.bat
index 126f3703c..652cd9503 100755
--- a/mingwenv.bat
+++ b/mingwenv.bat
@@ -1,6 +1,6 @@
@echo Setting environment variables for MinGw build of Inkscape
IF "%DEVLIBS_PATH%"=="" set DEVLIBS_PATH=c:\devlibs
-IF "%MINGW_PATH%"=="" set MINGW_PATH=c:\mingw
+IF "%MINGW_PATH%"=="" set MINGW_PATH=c:\mingw32
set MINGW_BIN=%MINGW_PATH%\bin
set PKG_CONFIG_PATH=%DEVLIBS_PATH%\lib\pkgconfig
set GS_BIN=C:\latex\gs\gs8.61\bin
diff --git a/src/sp-object.cpp b/src/sp-object.cpp
index c3ce3606b..be3a1ab9d 100644
--- a/src/sp-object.cpp
+++ b/src/sp-object.cpp
@@ -972,7 +972,7 @@ Inkscape::XML::Node* SPObject::write(Inkscape::XML::Document *doc, Inkscape::XML
if (!( flags & SP_OBJECT_WRITE_EXT )) {
repr->setAttribute("inkscape:collect", NULL);
}
- } else {
+ } else if (repr) {
repr->setAttribute("id", this->getId());
if (this->xml_space.set) {