Avoid crash in html item test

qgis · Aug 8, 2012 · ce84b56 · ce84b56
1 parent 9a3d6ab
commit ce84b56
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/core/composer/qgscomposition.cpp b/src/core/composer/qgscomposition.cpp
@@ -463,8 +463,9 @@ void QgsComposition::addItemsFromXML( const QDomElement& elem, const QDomDocumen
   for ( int i = 0; i < composerHtmlList.size(); ++i )
   {
     QDomElement currentHtmlElem = composerHtmlList.at( i ).toElement();
-    QgsComposerHtml* newHtml = new QgsComposerHtml( this, true );
+    QgsComposerHtml* newHtml = new QgsComposerHtml( this, false );
     newHtml->readXML( currentHtmlElem, doc );
+    newHtml->setCreateUndoCommands( true );
     this->addMultiFrame( newHtml );
   }
 }

diff --git a/tests/src/core/testqgscomposerhtml.cpp b/tests/src/core/testqgscomposerhtml.cpp
@@ -67,7 +67,7 @@ void TestQgsComposerHtml::table()
                                  "control_images" + QDir::separator() + "expected_composerhtml" + QDir::separator() + "composerhtml_table.png" ) );
   bool result = checker.testComposition();
   mComposition->removeMultiFrame( htmlItem );
-  delete htmlItem;
+  //delete htmlItem;
   QVERIFY( result );
 }