mirrors/packwiz-installer
1
0
Fork 0
mirror of https://github.com/packwiz/packwiz-installer.git synced 2025-04-19 21:16:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Whoops, I am bad programmer

Browse Source
This commit is contained in:
comp500 2019-08-10 02:18:02 +01:00
parent eaed3b2187
commit dcf8d21aad
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/link/infra/packwiz/installer/DownloadTask.java
View File

@ -187,7 +187,7 @@ class DownloadTask implements IOptionDetails {
public boolean correctSide() {
if (metadata.linkedFile != null) {
return downloadSide.hasSide(metadata.linkedFile.side);
return metadata.linkedFile.side.hasSide(downloadSide);
}
return true;
}

12
src/main/java/link/infra/packwiz/installer/UpdateManager.java
View File

@ -323,8 +323,16 @@ public class UpdateManager {
task = null;
}
// Update manifest - If there were no errors cachedFile has already been modified in place (good old pass by reference)
if (task != null && task.getException() != null) {
manifest.cachedFiles.put(task.metadata.file, task.cachedFile.getRevert());
if (task != null) {
if (task.getException() != null) {
ManifestFile.File file = task.cachedFile.getRevert();
if (file != null) {
manifest.cachedFiles.put(task.metadata.file, file);
}
} else {
// idiot, if it wasn't there in the first place it won't magically appear there
manifest.cachedFiles.putIfAbsent(task.metadata.file, task.cachedFile);
}
}
// TODO: show errors properly?
String progress;