Merge branch 'master' into features/issue_62_harman_installation_changes

# Conflict fixed: # InstallerSharedCore/src/actionScripts/ui/FeathersUIWrapper.as
Moonshine-IDE · Jul 15, 2021 · 525bff4 · 525bff4
2 parents dabcf13 + 2e92e83
commit 525bff4
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/InstallerSharedCore/src/actionScripts/ui/FeathersUIWrapper.as b/InstallerSharedCore/src/actionScripts/ui/FeathersUIWrapper.as
@@ -329,7 +329,10 @@ package actionScripts.ui
 			if(this.stage != null && this.stage.focus != null && (this.stage.focus == this || this.contains(this.stage.focus))) {
 				return;
 			}
-			this._feathersUIFocusManager.enabled = false;
+
+			if(this._feathersUIFocusManager) {
+				this._feathersUIFocusManager.enabled = false;
+			}
 		}
 	}
 }