1 files changed, 4 insertions, 0 deletions
diff --git a/o3d/plugin/mac/o3d_layer.mm b/o3d/plugin/mac/o3d_layer.mm
index a566f1b6..ee85df9 100644
--- a/o3d/plugin/mac/o3d_layer.mm
+++ b/o3d/plugin/mac/o3d_layer.mm
@@ -71,6 +71,10 @@ using o3d::DisplayWindowMac;
              pixelFormat:(CGLPixelFormatObj)pf
             forLayerTime:(CFTimeInterval)t
              displayTime:(const CVTimeStamp *)ts {
+  // Watch out for the plugin being destroyed out from under us.
+  if (!obj_) {
+    return;
+  }
 
   // Set the current context to the one given to us.
   CGLSetCurrentContext(ctx);