# # # patch "src/model/Manifest.cpp" # from [362e3fe7a8399c28ab69235376d5955421b2cd66] # to [6c9e78ed14e8b0889bc1d84bafafe82c46f1ed3c] # # patch "src/model/Manifest.h" # from [40134a38a50a1e1fca501963c82b6aa822477bd3] # to [9231a0ed7276006ab96952b04dbb83997a6a48e6] # ============================================================ --- src/model/Manifest.cpp 362e3fe7a8399c28ab69235376d5955421b2cd66 +++ src/model/Manifest.cpp 6c9e78ed14e8b0889bc1d84bafafe82c46f1ed3c @@ -21,14 +21,12 @@ Manifest::Manifest(QObject * parent, con #include "IconProvider.h" Manifest::Manifest(QObject * parent, const DatabaseFile & db) - : QAbstractItemModel(parent), AutomateCommand(0), databaseFile(db) -{ - root = NULL; -} + : QAbstractItemModel(parent), AutomateCommand(0), databaseFile(db), root(0) +{} Manifest::~Manifest() { - delete root; + if (root) delete root; } void Manifest::readManifest(const QString & rev) @@ -55,6 +53,12 @@ void Manifest::processTaskResult(const M QMap directoryMap; + if (root) + { + delete root; + root = 0; + } + for (int i=0, size = list.size(); i < size; ++i) { Stanza stanza = list.at(i); ============================================================ --- src/model/Manifest.h 40134a38a50a1e1fca501963c82b6aa822477bd3 +++ src/model/Manifest.h 9231a0ed7276006ab96952b04dbb83997a6a48e6 @@ -87,8 +87,8 @@ private: private: void processTaskResult(const MonotoneTask &); + DatabaseFile databaseFile; ManifestEntry * root; - DatabaseFile databaseFile; }; #endif