diff options
| author | Thomas Tanner <trtanner@btinternet.com> | 2015-12-26 15:27:34 +0000 |
|---|---|---|
| committer | Thomas Tanner <trtanner@btinternet.com> | 2015-12-26 15:27:34 +0000 |
| commit | f2b2ee1a11c79415020eeb56af2d9ac855c059d8 (patch) | |
| tree | 3a2b8658fdadb5aa6857aa1a51b836edcea6c3ab | |
| parent | ae6bb99c521af611989439b6db8a14a1b27866fc (diff) | |
| parent | 5adb3b377ecd50a75dd034a49582a1da91b67e1c (diff) | |
Merge remote-tracking branch 'TanninOne/master' into issue/418
| -rw-r--r-- | readme.md | 2 | ||||
| -rw-r--r-- | src/downloadmanager.cpp | 5 | ||||
| -rw-r--r-- | src/downloadmanager.h | 4 |
3 files changed, 6 insertions, 5 deletions
@@ -32,9 +32,11 @@ Here is a complete list: * https://github.com/TanninOne/modorganizer-game_skyrim
* https://github.com/TanninOne/modorganizer-game_oblivion
* https://github.com/TanninOne/modorganizer-game_fallout3
+* https://github.com/TanninOne/modorganizer-game_fallout4
* https://github.com/TanninOne/modorganizer-game_falloutnv
* https://github.com/TanninOne/modorganizer-game_gamebryo
* https://github.com/TanninOne/modorganizer-game_features
* https://github.com/TanninOne/modorganizer-check_fnis
* https://github.com/TanninOne/modorganizer-plugin_python
* https://github.com/TanninOne/modorganizer-bsa_extractor
+* https://github.com/TanninOne/usvfs
diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp index cbc1ba45..c551e590 100644 --- a/src/downloadmanager.cpp +++ b/src/downloadmanager.cpp @@ -1244,14 +1244,13 @@ int DownloadManager::startDownloadURLs(const QStringList &urls) return m_ActiveDownloads.size() - 1;
}
-/* This doesn't appear to be used by anything
int DownloadManager::startDownloadNexusFile(int modID, int fileID)
{
int newID = m_ActiveDownloads.size();
- addNXMDownload(QString("nxm://%1/mods/%2/files/%3").arg(ToQString(MOShared::GameInfo::instance().getGameName())).arg(modID).arg(fileID));
+ addNXMDownload(QString("nxm://%1/mods/%2/files/%3").arg(m_ManagedGame->getGameShortName()).arg(modID).arg(fileID));
return newID;
}
-*/
+
QString DownloadManager::downloadPath(int id)
{
return getFilePath(id);
diff --git a/src/downloadmanager.h b/src/downloadmanager.h index 54db4648..e63a0113 100644 --- a/src/downloadmanager.h +++ b/src/downloadmanager.h @@ -329,9 +329,9 @@ public: virtual int startDownloadURLs(const QStringList &urls);
- /* This doesn't appear to be used anywhere
+
virtual int startDownloadNexusFile(int modID, int fileID);
- */
+
virtual QString downloadPath(int id);
/**
|