Gson isn't broken, I'm broken

packwiz · Jun 24, 2019 · 533c7a3 · 533c7a3
1 parent d18e134
commit 533c7a3
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/main/java/link/infra/packwiz/installer/UpdateManager.java b/src/main/java/link/infra/packwiz/installer/UpdateManager.java
@@ -110,18 +110,16 @@ protected void start() {
 
 		ui.submitProgress(new InstallProgress("Loading manifest file..."));
 		Gson gson = new Gson();
-		ManifestFile manifest = null;
+		ManifestFile manifest;
 		try {
 			manifest = gson.fromJson(new FileReader(Paths.get(opts.packFolder, opts.manifestFile).toString()),
 					ManifestFile.class);
-		} catch (FileNotFoundException e) { // Do nothing
+		} catch (FileNotFoundException e) {
+			manifest = new ManifestFile();
 		} catch (JsonSyntaxException | JsonIOException e) {
 			ui.handleExceptionAndExit(e);
 			return;
 		}
-		if (manifest == null) {
-			manifest = new ManifestFile();
-		}
 
 		ui.submitProgress(new InstallProgress("Loading pack file..."));
 		GeneralHashingSource packFileSource;
@@ -142,7 +140,7 @@ protected void start() {
 			return;
 		}
 
-		if (packFileSource.hashIsEqual(manifest.packFileHash)) {
+		if (manifest.packFileHash != null && packFileSource.hashIsEqual(manifest.packFileHash)) {
 			System.out.println("Hash already up to date!");
 			// WOOO it's already up to date
 			// todo: --force?