Merge pull request #13530 from samcake/punk

Really add safe check for targetDisplayPLugin
This commit is contained in:
Bradley Austin Davis 2018-07-03 09:41:25 -07:00 committed by GitHub
commit 61005d456b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2722,7 +2722,7 @@ void Application::initializeDisplayPlugins() {
setDisplayPlugin(defaultDisplayPlugin);
// Now set the desired plugin if it's not the same as the default plugin
if (!targetDisplayPlugin && (targetDisplayPlugin != defaultDisplayPlugin)) {
if (targetDisplayPlugin && (targetDisplayPlugin != defaultDisplayPlugin)) {
setDisplayPlugin(targetDisplayPlugin);
}