diff --git a/.gitignore b/.gitignore index 41ff04101d..a637e184dd 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ Logs/ Replays/ settings.yaml \#* +.*.sw? diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/CncInstallFromCDLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/CncInstallFromCDLogic.cs index c1816b2e05..ca65ee42d2 100644 --- a/OpenRA.Mods.Cnc/Widgets/Logic/CncInstallFromCDLogic.cs +++ b/OpenRA.Mods.Cnc/Widgets/Logic/CncInstallFromCDLogic.cs @@ -35,7 +35,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic this.filesToCopy = filesToCopy; this.filesToExtract = filesToExtract; - panel = widget.GetWidget("INSTALL_FROMCD_PANEL"); + panel = widget; progressBar = panel.GetWidget("PROGRESS_BAR"); statusLabel = panel.GetWidget("STATUS_LABEL"); @@ -47,6 +47,7 @@ namespace OpenRA.Mods.Cnc.Widgets.Logic installingContainer = panel.GetWidget("INSTALLING"); insertDiskContainer = panel.GetWidget("INSERT_DISK"); + CheckForDisk(); }