Merge pull request #13505 from samcake/punk

Fixing a bug if the last session display plugin is an invalid name, resolve to default
This commit is contained in:
Bradley Austin Davis 2018-07-02 14:55:04 -07:00 committed by GitHub
commit b862694e32
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

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