diff options
| author | Maarten ter Huurne <maarten@treewalker.org> | 2008-09-10 01:03:22 +0000 |
|---|---|---|
| committer | Maarten ter Huurne <maarten@treewalker.org> | 2008-09-10 01:03:22 +0000 |
| commit | eb1228cdb195db4d0deb7760ce4e76982e15ae98 (patch) | |
| tree | 1238116961b5bb8d4fa13a5f0d4c2c7053e05851 /Source/Core | |
| parent | 54c2a07de50993d8bad92946543179bb6573c95a (diff) | |
Moved SysMessage() from the video plugin into the main app, so the GUI and non-GUI executable can handle it in a different way. This fixes a crash in DolphinNoGUI when SysMessage() was called and tried to use a non-initialized wxWidgets. (this commit contains changes that should have been in revision 489)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@490 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Src/Core.cpp | 1 | ||||
| -rw-r--r-- | Source/Core/Core/Src/Host.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Source/Core/Core/Src/Core.cpp b/Source/Core/Core/Src/Core.cpp index c71058a87b..ce94a78090 100644 --- a/Source/Core/Core/Src/Core.cpp +++ b/Source/Core/Core/Src/Core.cpp @@ -264,6 +264,7 @@ THREAD_RETURN EmuThread(void *pArg) VideoInitialize.pSetPEFinish = PixelEngine::SetFinish;
VideoInitialize.pWindowHandle = _CoreParameter.hMainWindow; // NULL; // filled by video_initialize
VideoInitialize.pLog = Callback_VideoLog;
+ VideoInitialize.pSysMessage = Host_SysMessage;
VideoInitialize.pRequestWindowSize = NULL; //Callback_VideoRequestWindowSize;
VideoInitialize.pCopiedToXFB = Callback_VideoCopiedToXFB;
VideoInitialize.pVIRegs = VideoInterface::m_UVIUnknownRegs;
diff --git a/Source/Core/Core/Src/Host.h b/Source/Core/Core/Src/Host.h index b227f68a17..dc141c2743 100644 --- a/Source/Core/Core/Src/Host.h +++ b/Source/Core/Core/Src/Host.h @@ -50,4 +50,6 @@ void Host_SetWaitCursor(bool enable); void Host_UpdateStatusBar(const char* _pText);
+void Host_SysMessage(const char *fmt, ...);
+
#endif
|