diff options
| author | Thanasis Antoniou | 2019-12-16 22:58:26 +0200 |
|---|---|---|
| committer | Thanasis Antoniou | 2019-12-16 22:59:10 +0200 |
| commit | 0357293897ad80eb549e63952551c1781ad41b95 (patch) | |
| tree | 3dbed6e83093dcd19760227aa87091ed53df41ed /common | |
| parent | 4b2591b5c935bf5a2835cbfd10ac4202bb23e81b (diff) | |
| download | scummvm-rg350-0357293897ad80eb549e63952551c1781ad41b95.tar.gz scummvm-rg350-0357293897ad80eb549e63952551c1781ad41b95.tar.bz2 scummvm-rg350-0357293897ad80eb549e63952551c1781ad41b95.zip | |
ANDROID: Fix crash due to adding '.' folder in SearchManager
Diffstat (limited to 'common')
| -rw-r--r-- | common/archive.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/common/archive.cpp b/common/archive.cpp index 586f3c4fd1..ae89a9edcf 100644 --- a/common/archive.cpp +++ b/common/archive.cpp @@ -279,9 +279,12 @@ void SearchManager::clear() { if (g_system) g_system->addSysArchivesToSearchSet(*this, -1); +#ifndef __ANDROID__ // Add the current dir as a very last resort. // See also bug #2137680. + // But don't do this for Android platform, since it may lead to crashes addDirectory(".", ".", -2); +#endif } DECLARE_SINGLETON(SearchManager); |