From 97e8c68d7a92d6ccdb5f6ead8bba0d0af58efb3b Mon Sep 17 00:00:00 2001 From: Arno Date: Sat, 27 Oct 2012 13:39:25 +0200 Subject: Bugfixes: don't select dirs and don't crash on write settings Only select files when archiving pics from filemanager. While at it, I noticed a crash on close when no item is selected in PicturesWidget. So check if MappingData is valid on writing settings. Best way is MappingData::isValid(), and for that I needed a explicit constructor. --- mappingtreemodel.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'mappingtreemodel.cpp') diff --git a/mappingtreemodel.cpp b/mappingtreemodel.cpp index 2c636e6..80085c3 100644 --- a/mappingtreemodel.cpp +++ b/mappingtreemodel.cpp @@ -305,7 +305,7 @@ bool MappingTreeModel::deleteChild(const QModelIndex &idx){ } MappingData MappingTreeModel::mappingDataFromIndex(QModelIndex &idx) const{ - MappingData retval = { -1, -1, -1, QString(), QList() }; + MappingData retval; if(!idx.isValid()){ return retval; } @@ -579,3 +579,9 @@ QList MappingTreeResultModel::columnValuesRecursive(SmTreeItem *parent } return retval; } + +MappingData::MappingData() : mappingId(-1), parentId(-1), myId(-1) {} + +bool MappingData::isValid(){ + return !(mappingId == -1 && parentId == -1 && myId == -1); +} -- cgit v1.2.3-70-g09d2