From 5d1bdbfb3ff3a17019a6c6f47c1aca892528e09b Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Mon, 17 Dec 2018 11:25:35 -0800 Subject: [PATCH] Install in the loop we already have. Also don't create a valid marker file. Patch files are deleted immediately after use. --- .../java/com/threerings/getdown/launcher/Getdown.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java b/launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java index 730882c..46d853f 100644 --- a/launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java +++ b/launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java @@ -677,11 +677,6 @@ public abstract class Getdown extends Thread setStep(Step.DOWNLOAD); download(list); - // install the patch files (renaming them from _new) - for (Resource rsrc : list) { - rsrc.install(true); - } - // and apply them... setStep(Step.PATCH); updateStatus("m.patching"); @@ -692,6 +687,9 @@ public abstract class Getdown extends Thread int ii = 0; for (Resource prsrc : list) { ProgressObserver pobs = pragg.startElement(ii++); try { + // install the patch file (renaming them from _new) + prsrc.install(false); + // now apply the patch Patcher patcher = new Patcher(); patcher.patch(prsrc.getLocal().getParentFile(), prsrc.getLocal(), pobs); } catch (Exception e) {