FIX : Crash when creating a tag template based upon an empty one (fix…

…es #3250)
openstreetmap · Feb 10, 2011 · 2b0a76c · 2b0a76c
1 parent ea8d065
commit 2b0a76c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,7 @@
 v0.17.2
-    * FIX : Unblock indexing after an aborted doawnload, too (fixes #3248)
+    * FIX : Crash when creating a tag template based upon an empty one (fixes #3250)
+    * FIX : crash with --ignore-preferences
+    * FIX : Unblock indexing after an aborted download, too (fixes #3248)
     * FIX : Harden Filter Editor (fixes #3247)
 v0.17.1
     * FIX : Do not simplify (i.e. remove) nodes outside the downloaded area (fixes #3246)

diff --git a/src/TagTemplate/TagTemplate.cpp b/src/TagTemplate/TagTemplate.cpp
@@ -667,13 +667,13 @@ TagTemplate::TagTemplate()
 TagTemplate::TagTemplate(QString aName)
     : theWidget(0), theSelector(0)
 {
-    Q_UNUSED(aName)
+    theDescriptions[getDefaultLanguage()] = aName;
 }
 
 TagTemplate::TagTemplate(QString aName, QString aSelector)
     : theWidget(0)
 {
-    Q_UNUSED(aName)
+    theDescriptions[getDefaultLanguage()] = aName;
     theSelector = TagSelector::parse(aSelector);
 }
 
@@ -966,8 +966,10 @@ void TagTemplates::on_combo_activated(int idx)
         TagTemplate* newTmpl = new TagTemplate(theCombo->currentText());
         items.append(newTmpl);
 
-        for (int i=0; i<curTemplate->theFields.count(); ++i) {
-            curTemplate->theFields[i]->getCurrentValue();
+        if (curTemplate) {
+            for (int i=0; i<curTemplate->theFields.count(); ++i) {
+                curTemplate->theFields[i]->getCurrentValue();
+            }
         }
     } else {
         forcedTemplate = theCombo->itemData(idx).value<TagTemplate*>();