Merge remote-tracking branch 'origin/1.1.x_branch' into 1.2.x_branch

This commit is contained in:
2020-03-03 11:59:00 -06:00

View File

@@ -140,7 +140,7 @@ class App extends IPCContainer {
const configDisplay = createModalConditionally(showConfig, <Configuration version={selectedVersion} remoteSupported={remoteSupported} />); const configDisplay = createModalConditionally(showConfig, <Configuration version={selectedVersion} remoteSupported={remoteSupported} />);
const confirmDisplay = createModalConditionally(this.props.DisplayConfirmYesNo, <YesNo/>); const confirmDisplay = createModalConditionally(this.props.DisplayConfirmYesNo, <YesNo/>);
const dependencyDisplay = createModalConditionally(showDependencies, <DependencyList/>); const dependencyDisplay = createModalConditionally(showDependencies, <DependencyList/>, false, this.props.InstallActive);
const downloadDisplay = createModalConditionally(this.props.DownloadActive, <DownloadProgress />, false, true); const downloadDisplay = createModalConditionally(this.props.DownloadActive, <DownloadProgress />, false, true);
const errorDisplay = createModalConditionally(this.props.DisplayError, <ErrorDetails/>, true); const errorDisplay = createModalConditionally(this.props.DisplayError, <ErrorDetails/>, true);
const infoDisplay = createModalConditionally(this.props.DisplayInfo, <InfoDetails/>, true); const infoDisplay = createModalConditionally(this.props.DisplayInfo, <InfoDetails/>, true);