[aseprite] 187/196: Fix crash using an non-fully initialized SkiaDisplay on SkiaWindow::Impl::paintGC() on OS X

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 99d7eb53910dc5932cd46808c25ec01f4939a9c6
Author: David Capello <davidcapello at gmail.com>
Date:   Wed Apr 13 10:16:06 2016 -0300

    Fix crash using an non-fully initialized SkiaDisplay on SkiaWindow::Impl::paintGC() on OS X
---
 src/she/skia/skia_display.h     | 1 +
 src/she/skia/skia_window_osx.mm | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/src/she/skia/skia_display.h b/src/she/skia/skia_display.h
index 367bea7..0f4d408 100644
--- a/src/she/skia/skia_display.h
+++ b/src/she/skia/skia_display.h
@@ -20,6 +20,7 @@ class SkiaDisplay : public Display {
 public:
   SkiaDisplay(int width, int height, int scale);
 
+  bool isInitialized() const { return m_initialized; }
   void setSkiaSurface(SkiaSurface* surface);
   void resetSkiaSurface();
 
diff --git a/src/she/skia/skia_window_osx.mm b/src/she/skia/skia_window_osx.mm
index 52d4374..c5ee19d 100644
--- a/src/she/skia/skia_window_osx.mm
+++ b/src/she/skia/skia_window_osx.mm
@@ -272,6 +272,9 @@ private:
 #endif
 
   void paintGC(const gfx::Rect& rect) {
+    if (!m_display->isInitialized())
+      return;
+
     SkiaSurface* surface = static_cast<SkiaSurface*>(m_display->getSurface());
     const SkBitmap& bitmap = surface->bitmap();
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git