From df1d3bf569102e2bd8645b83f436d35b65eb003f Mon Sep 17 00:00:00 2001
From: Lipu Fei <lipu.fei815@gmail.com>
Date: Thu, 21 Dec 2017 15:42:48 +0100
Subject: [PATCH] Add fix and doc for Mac OpenGL crash

CURA-4726
---
 plugins/SimulationView/SimulationView.py | 20 ++++++++++++++++++++
 plugins/XRayView/XRayView.py             | 22 ++++++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/plugins/SimulationView/SimulationView.py b/plugins/SimulationView/SimulationView.py
index 44f472129f..6fc362725e 100644
--- a/plugins/SimulationView/SimulationView.py
+++ b/plugins/SimulationView/SimulationView.py
@@ -4,6 +4,7 @@
 import sys
 
 from PyQt5.QtCore import Qt
+from PyQt5.QtGui import QOpenGLContext
 from PyQt5.QtWidgets import QApplication
 
 from UM.Application import Application
@@ -13,6 +14,7 @@ from UM.Logger import Logger
 from UM.Math.Color import Color
 from UM.Mesh.MeshBuilder import MeshBuilder
 from UM.Message import Message
+from UM.Platform import Platform
 from UM.PluginRegistry import PluginRegistry
 from UM.Preferences import Preferences
 from UM.Resources import Resources
@@ -24,6 +26,7 @@ from UM.View.GL.OpenGLContext import OpenGLContext
 from UM.View.View import View
 from UM.i18n import i18nCatalog
 from cura.ConvexHullNode import ConvexHullNode
+from cura.CuraApplication import CuraApplication
 
 from .NozzleNode import NozzleNode
 from .SimulationPass import SimulationPass
@@ -414,6 +417,23 @@ class SimulationView(View):
                 return True
 
         if event.type == Event.ViewActivateEvent:
+            # FIX: on Max OS X, somehow QOpenGLContext.currentContext() can become None during View switching.
+            # This can happen when you do the following steps:
+            #   1. Start Cura
+            #   2. Load a model
+            #   3. Switch to Custom mode
+            #   4. Select the model and click on the per-object tool icon
+            #   5. Switch view to Layer view or X-Ray
+            #   6. Cura will very likely crash
+            # It seems to be a timing issue that the currentContext can somehow be empty, but I have no clue why.
+            # This fix tries to reschedule the view changing event call on the Qt thread again if the current OpenGL
+            # context is None.
+            if Platform.isOSX():
+                if QOpenGLContext.currentContext() is None:
+                    Logger.log("d", "current context of OpenGL is empty on Mac OS X, will try to create shaders later")
+                    CuraApplication.getInstance().callLater(lambda e=event: self.event(e))
+                    return
+
             # Make sure the SimulationPass is created
             layer_pass = self.getSimulationPass()
             self.getRenderer().addRenderPass(layer_pass)
diff --git a/plugins/XRayView/XRayView.py b/plugins/XRayView/XRayView.py
index 35509a9715..0c4035c62d 100644
--- a/plugins/XRayView/XRayView.py
+++ b/plugins/XRayView/XRayView.py
@@ -2,10 +2,13 @@
 # Cura is released under the terms of the LGPLv3 or higher.
 
 import os.path
+from PyQt5.QtGui import QOpenGLContext
 
 from UM.Application import Application
+from UM.Logger import Logger
 from UM.Math.Color import Color
 from UM.PluginRegistry import PluginRegistry
+from UM.Platform import Platform
 from UM.Event import Event
 from UM.View.View import View
 from UM.Scene.Iterator.BreadthFirstIterator import BreadthFirstIterator
@@ -13,6 +16,8 @@ from UM.Scene.Iterator.BreadthFirstIterator import BreadthFirstIterator
 from UM.View.RenderBatch import RenderBatch
 from UM.View.GL.OpenGL import OpenGL
 
+from cura.CuraApplication import CuraApplication
+
 from . import XRayPass
 
 ## View used to display a see-through version of objects with errors highlighted.
@@ -52,6 +57,23 @@ class XRayView(View):
 
     def event(self, event):
         if event.type == Event.ViewActivateEvent:
+            # FIX: on Max OS X, somehow QOpenGLContext.currentContext() can become None during View switching.
+            # This can happen when you do the following steps:
+            #   1. Start Cura
+            #   2. Load a model
+            #   3. Switch to Custom mode
+            #   4. Select the model and click on the per-object tool icon
+            #   5. Switch view to Layer view or X-Ray
+            #   6. Cura will very likely crash
+            # It seems to be a timing issue that the currentContext can somehow be empty, but I have no clue why.
+            # This fix tries to reschedule the view changing event call on the Qt thread again if the current OpenGL
+            # context is None.
+            if Platform.isOSX():
+                if QOpenGLContext.currentContext() is None:
+                    Logger.log("d", "current context of OpenGL is empty on Mac OS X, will try to create shaders later")
+                    CuraApplication.getInstance().callLater(lambda e = event: self.event(e))
+                    return
+
             if not self._xray_pass:
                 # Currently the RenderPass constructor requires a size > 0
                 # This should be fixed in RenderPass's constructor.