Merge branch 'master' into issue/418

# Conflicts:
#	SConstruct
#	src/organizerproxy.cpp

1 files changed, 2 insertions, 2 deletions

diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
index c551e590..e327e55a 100644
--- a/src/downloadmanager.cpp
+++ b/src/downloadmanager.cpp
@@ -450,7 +450,7 @@ void DownloadManager::addNXMDownload(const QString &url)
 {

   NXMUrl nxmInfo(url);

 

-  QString managedGame = m_ManagedGame->getGameShortName();

+  QString managedGame = m_ManagedGame->gameShortName();

   qDebug("add nxm download: %s", qPrintable(url));

   if (nxmInfo.game().compare(managedGame, Qt::CaseInsensitive) != 0) {

     qDebug("download requested for wrong game (game: %s, url: %s)", qPrintable(managedGame), qPrintable(nxmInfo.game()));

@@ -1247,7 +1247,7 @@ int DownloadManager::startDownloadURLs(const QStringList &urls)
 int DownloadManager::startDownloadNexusFile(int modID, int fileID)

 {

   int newID = m_ActiveDownloads.size();

-  addNXMDownload(QString("nxm://%1/mods/%2/files/%3").arg(m_ManagedGame->getGameShortName()).arg(modID).arg(fileID));

+  addNXMDownload(QString("nxm://%1/mods/%2/files/%3").arg(m_ManagedGame->gameShortName()).arg(modID).arg(fileID));

   return newID;

 }