From 73097113c7469d31948c3b1acf2d0af1cc8a6a94 Mon Sep 17 00:00:00 2001 From: amer cerkic Date: Wed, 10 Jul 2019 17:13:34 -0700 Subject: [PATCH] adding a null check to the display plugin. Possible that display plugin was disposed off during the check if hmdmode --- .../display-plugins/AbstractHMDScriptingInterface.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libraries/display-plugins/src/display-plugins/AbstractHMDScriptingInterface.cpp b/libraries/display-plugins/src/display-plugins/AbstractHMDScriptingInterface.cpp index d068bef3b0..81e196e5ad 100644 --- a/libraries/display-plugins/src/display-plugins/AbstractHMDScriptingInterface.cpp +++ b/libraries/display-plugins/src/display-plugins/AbstractHMDScriptingInterface.cpp @@ -47,5 +47,12 @@ void AbstractHMDScriptingInterface::setIPDScale(float IPDScale) { } bool AbstractHMDScriptingInterface::isHMDMode() const { - return PluginContainer::getInstance().getActiveDisplayPlugin()->isHmd(); + + auto displayPlugin = PluginContainer::getInstance().getActiveDisplayPlugin(); + + if (displayPlugin) { + return displayPlugin->isHmd(); + } + + return false; }