From d0f2c4fcf79222d5c6f3c17188a811b0a47833c6 Mon Sep 17 00:00:00 2001 From: Tannin Date: Wed, 17 Jul 2013 20:58:58 +0200 Subject: - 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 --- src/syncoverwritedialog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/syncoverwritedialog.cpp') 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(""), -1); - if (entry != NULL) { + if (entry.get() != NULL) { bool ignore; int origin = entry->getOrigin(ignore); addToComboBox(combo, ToQString(m_DirectoryStructure->getOriginByID(origin).getName()), origin); -- cgit v1.3.1