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

ALL: Merge from ScummVM rev 3a933138ce

Browse source
This commit is contained in:
Bastien Bouclet 2017-12-03 18:33:19 +01:00
parent 5dad979952
commit 3ec01653c3
134 changed files with 9868 additions and 9034 deletions
Download patch file Download diff file Expand all files Collapse all files

6
backends/platform/sdl/sdl.cpp
View file

@ -316,20 +316,22 @@ void OSystem_SDL::detectFramebufferSupport() {
#endif // USE_OPENGL
// End of ResidualVM specific code
#if defined(USE_TASKBAR)
void OSystem_SDL::engineInit() {
#ifdef USE_TASKBAR
// Add the started engine to the list of recent tasks
_taskbarManager->addRecent(ConfMan.getActiveDomainName(), ConfMan.get("description"));
// Set the overlay icon the current running engine
_taskbarManager->setOverlayIcon(ConfMan.getActiveDomainName(), ConfMan.get("description"));
#endif
}
void OSystem_SDL::engineDone() {
#ifdef USE_TASKBAR
// Remove overlay icon
_taskbarManager->setOverlayIcon("", "");
}
#endif
}
void OSystem_SDL::initSDL() {
// Check if SDL has not been initialized