summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-11-02 23:31:02 +0300
committerAndrei Karas <akaras@inbox.ru>2015-11-02 23:31:02 +0300
commitb86f75e0faf7d646d5414cb6a6893bbb07131315 (patch)
tree8ef56e73470affc1977d7da82bcba133a5e8cd95
parentafedfd380a9b7d7c7917ba5e8cf20e994a1c0728 (diff)
downloadmv-b86f75e0faf7d646d5414cb6a6893bbb07131315.tar.gz
mv-b86f75e0faf7d646d5414cb6a6893bbb07131315.tar.bz2
mv-b86f75e0faf7d646d5414cb6a6893bbb07131315.tar.xz
mv-b86f75e0faf7d646d5414cb6a6893bbb07131315.zip
Add some missing checks in renderers.
-rw-r--r--src/render/mobileopenglgraphics.cpp2
-rw-r--r--src/render/modernopenglgraphics.cpp2
-rw-r--r--src/render/sdl2graphics.cpp2
-rw-r--r--src/render/sdl2softwaregraphics.cpp2
-rw-r--r--src/render/sdlgraphics.cpp2
5 files changed, 10 insertions, 0 deletions
diff --git a/src/render/mobileopenglgraphics.cpp b/src/render/mobileopenglgraphics.cpp
index b385d8306..0ee37ddfe 100644
--- a/src/render/mobileopenglgraphics.cpp
+++ b/src/render/mobileopenglgraphics.cpp
@@ -845,6 +845,8 @@ void MobileOpenGLGraphics::calcWindow(ImageCollection *const vertCol,
return;
ImageVertexes *vert = nullptr;
const Image *const image = imgRect.grid[4];
+ if (!image)
+ return;
if (vertCol->currentGLImage != image->mGLImage)
{
vert = new ImageVertexes();
diff --git a/src/render/modernopenglgraphics.cpp b/src/render/modernopenglgraphics.cpp
index 9f3bd9809..e544254b4 100644
--- a/src/render/modernopenglgraphics.cpp
+++ b/src/render/modernopenglgraphics.cpp
@@ -797,6 +797,8 @@ void ModernOpenGLGraphics::calcWindow(ImageCollection *const vertCol,
return;
ImageVertexes *vert = nullptr;
const Image *const image = imgRect.grid[4];
+ if (!image)
+ return;
if (vertCol->currentGLImage != image->mGLImage)
{
vert = new ImageVertexes();
diff --git a/src/render/sdl2graphics.cpp b/src/render/sdl2graphics.cpp
index 3b631caa5..7bad93889 100644
--- a/src/render/sdl2graphics.cpp
+++ b/src/render/sdl2graphics.cpp
@@ -635,6 +635,8 @@ void SDLGraphics::calcWindow(ImageCollection *const vertCol,
{
ImageVertexes *vert = nullptr;
Image *const image = imgRect.grid[4];
+ if (!image)
+ return;
if (vertCol->currentImage != image)
{
vert = new ImageVertexes();
diff --git a/src/render/sdl2softwaregraphics.cpp b/src/render/sdl2softwaregraphics.cpp
index f7e5b9ee1..3afadd27c 100644
--- a/src/render/sdl2softwaregraphics.cpp
+++ b/src/render/sdl2softwaregraphics.cpp
@@ -819,6 +819,8 @@ void SDL2SoftwareGraphics::calcWindow(ImageCollection *const vertCol,
{
ImageVertexes *vert = nullptr;
Image *const image = imgRect.grid[4];
+ if (!image)
+ return;
if (vertCol->currentImage != image)
{
vert = new ImageVertexes();
diff --git a/src/render/sdlgraphics.cpp b/src/render/sdlgraphics.cpp
index db2d15ae4..771d000d8 100644
--- a/src/render/sdlgraphics.cpp
+++ b/src/render/sdlgraphics.cpp
@@ -821,6 +821,8 @@ void SDLGraphics::calcWindow(ImageCollection *const vertCol,
ImageVertexes *vert = nullptr;
Image *const image = imgRect.grid[4];
+ if (!image)
+ return;
if (vertCol->currentImage != image)
{
vert = new ImageVertexes();