[Scummvm-git-logs] scummvm master -> 233adb3cbdf76220b0528126df6ac91d98c447d0

[criezy]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
233adb3cbd SWORD25: Fix crash in non-extracted version


Commit: 233adb3cbdf76220b0528126df6ac91d98c447d0
    https://github.com/scummvm/scummvm/commit/233adb3cbdf76220b0528126df6ac91d98c447d0
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2020-10-07T11:45:24+01:00

Commit Message:
SWORD25: Fix crash in non-extracted version

This was a regression from commit 6d00724. The game was crashing
right at the start.

Changed paths:
    engines/sword25/package/packagemanager.cpp


diff --git a/engines/sword25/package/packagemanager.cpp b/engines/sword25/package/packagemanager.cpp
index 412df8d805..e33fe6798e 100644
--- a/engines/sword25/package/packagemanager.cpp
+++ b/engines/sword25/package/packagemanager.cpp
@@ -295,6 +295,7 @@ int PackageManager::doSearch(Common::ArchiveMemberList &list, const Common::Stri
 				matchType = (((typeFilter & PackageManager::FT_DIRECTORY) && node->isDirectory()) ||
 					((typeFilter & PackageManager::FT_FILE) && !node->isDirectory()));
 			} else {
+				name = (*it)->getName();
 				matchType = ((typeFilter & PackageManager::FT_DIRECTORY) && name.hasSuffix("/")) ||
 				((typeFilter & PackageManager::FT_FILE) && !name.hasSuffix("/"));
 			}