Skip to content
Browse files

egl: don't fail if the creation of the texture failed (FIXUP 196b26a).

  • Loading branch information...
1 parent f86c314 commit 6974fa059c9ffb7f4adf40a4e4eefb88ea040f73 @gbeauchesne committed Aug 20, 2012
Showing with 3 additions and 6 deletions.
  1. +3 −6 xbmc/windowing/X11/WinSystemX11GLES.cpp
View
9 xbmc/windowing/X11/WinSystemX11GLES.cpp
@@ -157,16 +157,13 @@ bool CWinSystemX11GLES::CreateNewWindow(const CStdString& name, bool fullScreen,
CBaseTexture *pIconTexture;
pIconTexture = CBaseTexture::LoadFromFile("special://xbmc/media/icon.png");
- if (!pIconTexture)
+ if (pIconTexture)
{
- CLog::Log(LOGERROR, "Failed to load XBMC icon");
- return false;
+ SDL_WM_SetIcon(SDL_CreateRGBSurfaceFrom(pIconTexture->GetPixels(), pIconTexture->GetWidth(), pIconTexture->GetHeight(), BPP, pIconTexture->GetPitch(), 0xff0000, 0x00ff00, 0x0000ff, 0xff000000L), NULL);
+ delete pIconTexture;
}
- SDL_WM_SetIcon(SDL_CreateRGBSurfaceFrom(pIconTexture->GetPixels(), pIconTexture->GetWidth(), pIconTexture->GetHeight(), BPP, pIconTexture->GetPitch(), 0xff0000, 0x00ff00, 0x0000ff, 0xff000000L), NULL);
SDL_WM_SetCaption("XBMC Media Center", NULL);
-
- delete pIconTexture;
m_bWindowCreated = true;
m_eglext = " ";

0 comments on commit 6974fa0

Please sign in to comment.
Something went wrong with that request. Please try again.