Merge branch 'master' of https://github.com/jrbudda/Vivecraft_116

jrbudda · Jan 24, 2021 · d6e01c7 · d6e01c7
2 parents bb48cfa + 8d05bd3
commit d6e01c7
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/installer/Installer.java b/installer/Installer.java
@@ -511,6 +511,7 @@ public void run()
 			}
 
 			//check for multimc
+			if (targetDir.exists())
 			for(File f : targetDir.listFiles()){
 				if(f.getName().equalsIgnoreCase("multimc.exe") || (f.getName().equalsIgnoreCase("multimc") && f.isFile()) || f.getName().equalsIgnoreCase("multimc.cfg")){
 					ArrayList<File> ilist = new ArrayList<File>();
@@ -1287,7 +1288,8 @@ private String checkForJava14(String path) {
 				JFileChooser fileChooser = new JFileChooser();
 				fileChooser.setFileSelectionMode(JFileChooser.FILES_ONLY);
 				fileChooser.setFileHidingEnabled(false);
-				fileChooser.setCurrentDirectory(new File(System.getProperty("java.home")));
+				if (isWindows)
+					fileChooser.setCurrentDirectory(new File(System.getenv("ProgramFiles")));
 				fileChooser.setFileFilter(new FileFilter() {
 					@Override
 					public boolean accept(File f) {