Skip to content

Commit 41bb3c6

Browse files
committed
Fix issue with moving directories that are not required
1 parent 999b9a3 commit 41bb3c6

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

src/modlist.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1030,11 +1030,13 @@ bool ModList::dropLocalFiles(const ModListDropInfo& dropInfo, int row,
10301030
for (auto localUrl : dropInfo.localUrls()) {
10311031
QFileInfo sourceInfo(localUrl.url.toLocalFile());
10321032
if (localUrl.originName.compare("overwrite", Qt::CaseInsensitive) == 0) {
1033+
bool needsMove = true;
10331034
if (sourceInfo.isDir()) {
10341035
for (auto dir : m_Organizer->managedGame()->getModMappings().keys()) {
10351036
QDir overDir(m_Organizer->overwritePath());
10361037
if (sourceInfo.canonicalFilePath().compare(overDir.absoluteFilePath(dir),
10371038
Qt::CaseInsensitive) == 0) {
1039+
needsMove = false;
10381040

10391041
QDirIterator dirIter(overDir.absoluteFilePath(dir),
10401042
QDir::AllDirs | QDir::Files | QDir::NoDotAndDotDot);
@@ -1050,7 +1052,8 @@ bool ModList::dropLocalFiles(const ModListDropInfo& dropInfo, int row,
10501052
}
10511053
}
10521054
}
1053-
} else {
1055+
}
1056+
if (needsMove) {
10541057
QString sourceFile = sourceInfo.canonicalFilePath();
10551058

10561059
QFileInfo targetInfo(modDir.absoluteFilePath(localUrl.relativePath));

0 commit comments

Comments
 (0)