ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove duplicate instantiation of PNG wxImage handler. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6028 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2010-08-01 15:48:11 +00:00
parent c765127f0d
commit 4bef335632
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinWX/Src/Main.cpp
View File

@ -350,8 +350,8 @@ bool DolphinApp::OnInit()
SConfig::GetInstance().m_LocalCoreStartupParameter.m_strWiimotePlugin = SConfig::GetInstance().m_LocalCoreStartupParameter.m_strWiimotePlugin =
std::string(wiimotePluginFilename.mb_str()); std::string(wiimotePluginFilename.mb_str());
// Enable the PNG image handler // Enable the PNG image handler for screenshots
wxInitAllImageHandlers(); wxImage::AddHandler(new wxPNGHandler);
SetEnableAlert(SConfig::GetInstance().m_LocalCoreStartupParameter.bUsePanicHandlers); SetEnableAlert(SConfig::GetInstance().m_LocalCoreStartupParameter.bUsePanicHandlers);

4
Source/Plugins/Plugin_VideoOGL/Src/main.cpp
View File

@ -174,10 +174,6 @@ void Initialize(void *init)
g_Config.GameIniLoad(globals->game_ini); g_Config.GameIniLoad(globals->game_ini);
g_Config.UpdateProjectionHack(); g_Config.UpdateProjectionHack();
#if defined(HAVE_WX) && HAVE_WX
// Enable support for PNG screenshots.
wxImage::AddHandler( new wxPNGHandler );
#endif
UpdateActiveConfig(); UpdateActiveConfig();
if (!OpenGL_Create(g_VideoInitialize, 640, 480)) if (!OpenGL_Create(g_VideoInitialize, 640, 480))