Merge pull request #601 from Project579/archive_conflicts_2

Archive conflicts Updating to Lastest Develop

1 files changed, 8 insertions, 4 deletions

diff --git a/src/modlist.cpp b/src/modlist.cpp
index 757fedb2..0b66a663 100644
--- a/src/modlist.cpp
+++ b/src/modlist.cpp
@@ -167,7 +167,7 @@ QString ModList::getFlagText(ModInfo::EFlag flag, ModInfo::Ptr modInfo) const
     case ModInfo::FLAG_ARCHIVE_CONFLICT_OVERWRITE: return tr("Overwrites another archive file");

     case ModInfo::FLAG_ARCHIVE_CONFLICT_OVERWRITTEN: return tr("Overwritten by another archive file");

     case ModInfo::FLAG_ARCHIVE_CONFLICT_MIXED: return tr("Archive files overwrites & overwritten");

-    case ModInfo::FLAG_ALTERNATE_GAME: return tr("Alternate game source");

+    case ModInfo::FLAG_ALTERNATE_GAME: return tr("This mod targets a different game");

     default: return "";

   }

 }

@@ -981,7 +981,6 @@ bool ModList::dropURLs(const QMimeData *mimeData, int row, const QModelIndex &pa
   if (row == -1) {

     row = parent.row();

   }

-

   ModInfo::Ptr modInfo = ModInfo::getByIndex(row);

   QDir modDirectory(modInfo->absolutePath());

   QDir gameDirectory(Settings::instance().getOverwriteDirectory());

@@ -993,12 +992,14 @@ bool ModList::dropURLs(const QMimeData *mimeData, int row, const QModelIndex &pa
   QString overwriteName = ModInfo::getByIndex(overwriteIndex)->name();

 

   for (const QUrl &url : mimeData->urls()) {

+    qDebug("URL drop requested: %s", qPrintable(url.toLocalFile()));

     if (!url.isLocalFile()) {

+      qDebug("URL drop ignored: Not a local file.");

       continue;

     }

     QString relativePath = gameDirectory.relativeFilePath(url.toLocalFile());

     if (relativePath.startsWith("..")) {

-      qDebug("%s drop ignored", qPrintable(url.toLocalFile()));

+      qDebug("URL drop ignored: relative path starts with ..");

       continue;

     }

     source.append(url.toLocalFile());

@@ -1007,7 +1008,10 @@ bool ModList::dropURLs(const QMimeData *mimeData, int row, const QModelIndex &pa
   }

 

   if (source.count() != 0) {

-    shellMove(source, target);

+    if (!shellMove(source, target)) {

+      qDebug("Move failed %lu",::GetLastError());

+      return false;

+    }

   }

 

   return true;