diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/downloadmanager.cpp | 10 | ||||
| -rw-r--r-- | src/resources/conflict-mixed-blue.png | bin | 692 -> 571 bytes | |||
| -rw-r--r-- | src/resources/conflict-overwrite-blue.png | bin | 964 -> 594 bytes | |||
| -rw-r--r-- | src/resources/conflict-overwritten-blue.png | bin | 577 -> 455 bytes |
5 files changed, 15 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a53d845d..117528f8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -232,17 +232,17 @@ target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dlls.manifest.qt5 +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/dlls.manifest.qt5" DESTINATION bin/dlls RENAME dlls.manifest) install(FILES ${qm_files} DESTINATION bin/translations) -install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/stylesheets - ${CMAKE_CURRENT_SOURCE_DIR}/tutorials +install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/stylesheets" + "${CMAKE_CURRENT_SOURCE_DIR}/tutorials" DESTINATION bin) deploy_qt(BINARIES ModOrganizer.exe uibase.dll plugins/bsa_packer.dll) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/../qdds.dll DESTINATION bin/dlls/imageformats) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/markdown.html DESTINATION bin/resources) +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../qdds.dll" DESTINATION bin/dlls/imageformats) +install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/resources/markdown.html" DESTINATION bin/resources) diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp index ff4e9458..762e3cdb 100644 --- a/src/downloadmanager.cpp +++ b/src/downloadmanager.cpp @@ -550,6 +550,16 @@ void DownloadManager::addNXMDownload(const QString &url) validGames.append(m_ManagedGame->validShortNames()); for (auto game : validGames) { MOBase::IPluginGame* gamePlugin = m_OrganizerCore->getGame(game); + + // some game plugins give names in validShortNames() that may refer to other + // plugins, like ttw returning "FalloutNV" and "Fallout3"; if these plugins + // are not loaded, getGame() might return null + if (!gamePlugin) { + // log an error, it's most probably not normal + log::error("no plugin for game '{}', an antivirus might have deleted it", game); + continue; + } + if ( nxmInfo.game().compare(gamePlugin->gameShortName(), Qt::CaseInsensitive) == 0 || nxmInfo.game().compare(gamePlugin->gameNexusName(), Qt::CaseInsensitive) == 0 diff --git a/src/resources/conflict-mixed-blue.png b/src/resources/conflict-mixed-blue.png Binary files differindex 2afbb304..dc0c33f2 100644 --- a/src/resources/conflict-mixed-blue.png +++ b/src/resources/conflict-mixed-blue.png diff --git a/src/resources/conflict-overwrite-blue.png b/src/resources/conflict-overwrite-blue.png Binary files differindex 3247e7b7..129a0665 100644 --- a/src/resources/conflict-overwrite-blue.png +++ b/src/resources/conflict-overwrite-blue.png diff --git a/src/resources/conflict-overwritten-blue.png b/src/resources/conflict-overwritten-blue.png Binary files differindex 3a032a55..856aca16 100644 --- a/src/resources/conflict-overwritten-blue.png +++ b/src/resources/conflict-overwritten-blue.png |
