summaryrefslogtreecommitdiff
path: root/src/syncoverwritedialog.cpp
diff options
context:
space:
mode:
authorTannin <devnull@localhost>2013-07-17 20:58:58 +0200
committerTannin <devnull@localhost>2013-07-17 20:58:58 +0200
commitd0f2c4fcf79222d5c6f3c17188a811b0a47833c6 (patch)
tree12c9e4f529caa0f5830c8dd52d785b3e2df5462b /src/syncoverwritedialog.cpp
parent36ac91e0b765b1ae099e93054447beca8f461f74 (diff)
- now avoids a few unnecessary copy operations during generation of the directory structure
- bugfix: circular dependency caused a memory leak - bugfix: removing a single mod lead to the wrong mod being deleted
Diffstat (limited to 'src/syncoverwritedialog.cpp')
-rw-r--r--src/syncoverwritedialog.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/syncoverwritedialog.cpp b/src/syncoverwritedialog.cpp
index 8a496e24..32b76c97 100644
--- a/src/syncoverwritedialog.cpp
+++ b/src/syncoverwritedialog.cpp
@@ -90,10 +90,10 @@ void SyncOverwriteDialog::readTree(const QString &path, DirectoryEntry *director
newItem = NULL;
}
} else {
- const FileEntry *entry = directoryStructure->findFile(ToWString(file));
+ const FileEntry::Ptr entry = directoryStructure->findFile(ToWString(file));
QComboBox* combo = new QComboBox(ui->syncTree);
combo->addItem(tr("<don't sync>"), -1);
- if (entry != NULL) {
+ if (entry.get() != NULL) {
bool ignore;
int origin = entry->getOrigin(ignore);
addToComboBox(combo, ToQString(m_DirectoryStructure->getOriginByID(origin).getName()), origin);