From 4bef335632b7742734b6b2f264ce6f37b014a4b7 Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Sun, 1 Aug 2010 15:48:11 +0000 Subject: [PATCH] Remove duplicate instantiation of PNG wxImage handler. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6028 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/DolphinWX/Src/Main.cpp | 4 ++-- Source/Plugins/Plugin_VideoOGL/Src/main.cpp | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Source/Core/DolphinWX/Src/Main.cpp b/Source/Core/DolphinWX/Src/Main.cpp index e1f3bcf241..1c620bbbb2 100644 --- a/Source/Core/DolphinWX/Src/Main.cpp +++ b/Source/Core/DolphinWX/Src/Main.cpp @@ -350,8 +350,8 @@ bool DolphinApp::OnInit() SConfig::GetInstance().m_LocalCoreStartupParameter.m_strWiimotePlugin = std::string(wiimotePluginFilename.mb_str()); - // Enable the PNG image handler - wxInitAllImageHandlers(); + // Enable the PNG image handler for screenshots + wxImage::AddHandler(new wxPNGHandler); SetEnableAlert(SConfig::GetInstance().m_LocalCoreStartupParameter.bUsePanicHandlers); diff --git a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp index e3e9952823..a657ac38e7 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/main.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/main.cpp @@ -174,10 +174,6 @@ void Initialize(void *init) g_Config.GameIniLoad(globals->game_ini); g_Config.UpdateProjectionHack(); -#if defined(HAVE_WX) && HAVE_WX - // Enable support for PNG screenshots. - wxImage::AddHandler( new wxPNGHandler ); -#endif UpdateActiveConfig(); if (!OpenGL_Create(g_VideoInitialize, 640, 480))