FIX: [droid] Crash after regaining focus (fixes xbmc#13455)

koying · Nov 1, 2012 · 64ce046 · davilla · Nov 2, 2012 · koying
1 parent 0be99e9
commit 64ce046
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/xbmc/windowing/egl/EGLNativeType.h b/xbmc/windowing/egl/EGLNativeType.h
@@ -145,5 +145,5 @@ class CEGLNativeType
 
 protected:
   XBNativeDisplayType  m_nativeDisplay;
-  XBNativeWindowType   m_nativeWindow;
+  mutable XBNativeWindowType   m_nativeWindow;
 };
diff --git a/xbmc/windowing/egl/EGLNativeTypeAndroid.cpp b/xbmc/windowing/egl/EGLNativeTypeAndroid.cpp
@@ -78,6 +78,7 @@ bool CEGLNativeTypeAndroid::GetNativeWindow(XBNativeWindowType **nativeWindow) c
 {
   if (!nativeWindow)
     return false;
+  m_nativeWindow = CXBMCApp::GetNativeWindow();
   *nativeWindow = (XBNativeWindowType*) &m_nativeWindow;
   return true;
 }