diff options
| author | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-08-26 22:44:17 -0400 |
| commit | 4a69dc13d92e82fff85dc5a3a923b74ced259ffa (patch) | |
| tree | 8945cd3745fd65f28b043caf7b1beddbbce2b2a1 /engines/engine.cpp | |
| parent | ad293b249e74dd1cfbdbd721d02145efbdaf9eca (diff) | |
| parent | 5e174cbfe466dbbe8e5470b0a00de1481b986181 (diff) | |
| download | scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.gz scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.tar.bz2 scummvm-rg350-4a69dc13d92e82fff85dc5a3a923b74ced259ffa.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/engine.cpp')
| -rw-r--r-- | engines/engine.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/engines/engine.cpp b/engines/engine.cpp index b19daa2611..ee1d53fa9c 100644 --- a/engines/engine.cpp +++ b/engines/engine.cpp @@ -41,6 +41,7 @@ #include "common/list.h" #include "common/list_intern.h" #include "common/scummsys.h" +#include "common/taskbar.h" #include "common/textconsole.h" #include "common/translation.h" @@ -79,10 +80,21 @@ static void defaultErrorHandler(const char *msg) { if (isSmartphone()) debugger = 0; #endif + +#if defined(USE_TASKBAR) + g_system->getTaskbarManager()->notifyError(); +#endif + if (debugger && !debugger->isActive()) { debugger->attach(msg); debugger->onFrame(); } + + +#if defined(USE_TASKBAR) + g_system->getTaskbarManager()->clearError(); +#endif + } } |