Initialized mWangSet in stampBrush and bucketFill

mapeditor · Aug 15, 2017 · 5f72b4a · 5f72b4a
1 parent d8acf51
commit 5f72b4a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/src/libtiled/mapreader.cpp b/src/libtiled/mapreader.cpp
@@ -612,7 +612,7 @@ void MapReaderPrivate::readTilesetWangSets(Tileset &tileset)
                 } else if (xml.name() == QLatin1String("wangedgecolor")
                            || xml.name() == QLatin1String("wangcornercolor")) {
                     const QXmlStreamAttributes wangColorAtts = xml.attributes();
-                    QString name = wangColorAtts.value(QLatin1String("name")).toString();\
+                    QString name = wangColorAtts.value(QLatin1String("name")).toString();
                     QColor color = wangColorAtts.value(QLatin1String("color")).toString();
                     int imageId = wangColorAtts.value(QLatin1String("tile")).toInt();
                     float probability = wangColorAtts.value(QLatin1String("probability")).toFloat();

diff --git a/src/libtiled/wangset.cpp b/src/libtiled/wangset.cpp
@@ -315,6 +315,7 @@ WangSet::WangSet(Tileset *tileset,
     mImageTileId(imageTileId),
     mUniqueFullWangIdCount(0)
 {
+    Q_ASSERT(tileset);
 }
 
 int WangSet::edgeColorCount() const

diff --git a/src/tiled/bucketfilltool.cpp b/src/tiled/bucketfilltool.cpp
@@ -53,6 +53,7 @@ BucketFillTool::BucketFillTool(QObject *parent)
     , mLastShiftStatus(false)
     , mIsRandom(false)
     , mIsWangFill(false)
+    , mWangSet(nullptr)
     , mLastRandomStatus(false)
     , mStampActions(new StampActions(this))
 {

diff --git a/src/tiled/stampbrush.cpp b/src/tiled/stampbrush.cpp
@@ -53,6 +53,7 @@ StampBrush::StampBrush(QObject *parent)
     , mBrushBehavior(Free)
     , mIsRandom(false)
     , mIsWangFill(false)
+    , mWangSet(nullptr)
     , mStampActions(new StampActions(this))
 {
     connect(mStampActions->random(), &QAction::toggled, this, &StampBrush::randomChanged);