Merge branch 'master' into stable

1 files changed, 10 insertions, 6 deletions

diff --git a/src/render/mobileopenglgraphics.cpp b/src/render/mobileopenglgraphics.cpp
index 86707fac8..0ad5bfeb7 100644
--- a/src/render/mobileopenglgraphics.cpp
+++ b/src/render/mobileopenglgraphics.cpp
@@ -113,10 +113,14 @@ void MobileOpenGLGraphics::initArrays()
     // need alocate small size, after if limit reached reallocate to double size
     const int sz = mMaxVertices * 4 + 30;
     vertexBufSize = mMaxVertices;
-    mFloatTexArray = new GLfloat[sz];
-    mShortVertArray = new GLshort[sz];
-    mFloatTexArrayCached = new GLfloat[sz];
-    mShortVertArrayCached = new GLshort[sz];
+    if (!mFloatTexArray)
+        mFloatTexArray = new GLfloat[sz];
+    if (!mShortVertArray)
+        mShortVertArray = new GLshort[sz];
+    if (!mFloatTexArrayCached)
+        mFloatTexArrayCached = new GLfloat[sz];
+    if (!mShortVertArrayCached)
+        mShortVertArrayCached = new GLshort[sz];
 }
 
 bool MobileOpenGLGraphics::setVideoMode(const int w, const int h,
@@ -835,7 +839,7 @@ void MobileOpenGLGraphics::updateScreen()
     BLOCK_END("Graphics::updateScreen")
 }
 
-void MobileOpenGLGraphics::_beginDraw()
+void MobileOpenGLGraphics::beginDraw()
 {
     glMatrixMode(GL_TEXTURE);
     glLoadIdentity();
@@ -887,7 +891,7 @@ void MobileOpenGLGraphics::_beginDraw()
     pushClipArea(Rect(0, 0, mRect.w, mRect.h));
 }
 
-void MobileOpenGLGraphics::_endDraw()
+void MobileOpenGLGraphics::endDraw()
 {
     popClipArea();
 }