thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BASE: Fix being unable to run games when using dynamic plugins

Browse source 
When the plugin-engine mapping is not cached in the configuration file,
we were not scanning all the plugins to establish the mapping.

This is a regression from commit: e2d91258b7

This commit reverts the offending commit and implements a proper fix for
the case where there are no dynamic plugins.

Fixes #11300.
This commit is contained in:
Bastien Bouclet 2020-01-04 17:21:53 +01:00
parent cb2bb8fac7
commit f17a7a96da
3 changed files with 27 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
backends/plugins/elf/memory-manager.cpp
View file

@ -78,9 +78,13 @@ void ELFMemoryManager::trackAlloc(uint32 align, uint32 size) {
}
void ELFMemoryManager::allocateHeap() {
if (!_heapSize) {
warning("ELFMemoryManager: Unable to allocate the heap as its size could not be determined.");
return;
}
// The memory manager should only allocate once
assert (!_heap);
assert (_heapSize);
// clear the list
_allocList.clear();