summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Munro <brian.alexander.munro@gmail.com>2017-12-24 17:37:54 +0200
committerGitHub <noreply@github.com>2017-12-24 17:37:54 +0200
commit100f57dea19d0de520d97bb4faaadca29ee1f2b1 (patch)
tree37a85b58dee70c2bfd50f261d46e51568227dca5
parentdb1e63dc729258fd48ddb9a921ff88458b15db04 (diff)
parent708928e64374971f411431dc8d8382a0a471828a (diff)
Merge pull request #161 from erasmux/deactivate_bug_fix
Fix rare crash when deactiving mods
-rw-r--r--src/shared/directoryentry.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/shared/directoryentry.cpp b/src/shared/directoryentry.cpp
index e1cba08c..cebf270e 100644
--- a/src/shared/directoryentry.cpp
+++ b/src/shared/directoryentry.cpp
@@ -213,9 +213,9 @@ void FilesOrigin::setName(const std::wstring &name)
std::vector<FileEntry::Ptr> FilesOrigin::getFiles() const
{
std::vector<FileEntry::Ptr> result;
- for (FileEntry::Index fileIdx : m_Files) {
- result.push_back(m_FileRegister.lock()->getFile(fileIdx));
- }
+ for (FileEntry::Index fileIdx : m_Files)
+ if (FileEntry::Ptr p = m_FileRegister.lock()->getFile(fileIdx))
+ result.push_back(p);
return result;
}