Skip to content

Commit 303d7ec

Browse files
windows java fix
1 parent 5c180e2 commit 303d7ec

1 file changed

Lines changed: 8 additions & 4 deletions

File tree

SetupWindow.axaml.cs

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ public void Prepare()
9494
});
9595
DwnldMsRBtn.IsChecked = true;
9696
FindJava();
97+
DwnldBar.IsIndeterminate = false;
98+
DwnldBar.IsVisible = false;
9799
}
98100

99101
private async void FindJava()
@@ -102,6 +104,7 @@ private async void FindJava()
102104
DwnldBar.IsVisible = true;
103105
DwnldBar.ShowProgressText = true;
104106
DwnldBar.ProgressTextFormat = Lang.Resources.FindingJava;
107+
DwnldBar.IsIndeterminate = true;
105108
bool isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
106109
if (!isWindows)
107110
{
@@ -126,6 +129,7 @@ private async void FindJava()
126129
process.Dispose();
127130
if (javaver >= 11)
128131
{
132+
ParentPanel.IsEnabled = true;
129133
_config.JavaPath = "java";
130134
return;
131135
}
@@ -194,7 +198,7 @@ private async void FindJava()
194198
process.Start();
195199
await process.WaitForExitAsync();
196200
stdout = await process.StandardOutput.ReadToEndAsync();
197-
File.WriteAllText(Path.Join(MainWindow.ConfigFolder,new Guid().ToString()+"stdout-where.txt"), stdout);
201+
//File.WriteAllText(Path.Join(MainWindow.ConfigFolder,new Guid().ToString()+"stdout-where.txt"), stdout);
198202
List<string> javas = stdout.Split(Environment.NewLine.ToCharArray()).ToList();
199203
foreach (var java in javas)
200204
{
@@ -206,15 +210,15 @@ private async void FindJava()
206210
jcheck.StartInfo.RedirectStandardError = true;
207211
jcheck.Start();
208212
await jcheck.WaitForExitAsync();
209-
stdout = await process.StandardError.ReadToEndAsync();
210-
File.WriteAllText(Path.Join(MainWindow.ConfigFolder,new Guid().ToString()+"stdout-java.txt"),javaq+" returned: "+stdout);
213+
stdout = await jcheck.StandardError.ReadToEndAsync();
214+
//File.WriteAllText(Path.Join(MainWindow.ConfigFolder,new Guid().ToString()+"stdout-java.txt"),javaq+" returned: "+stdout);
211215
int javaver = int.Parse(stdout.Split('\"')[1].Split('.')[0]);
212216
jcheck.Dispose();
213217
if (javaver >= 11)
214218
{
215219
ParentPanel.IsEnabled = true;
216220
_config.JavaPath = javaq;
217-
break;
221+
return;
218222
}
219223
}
220224
var box = MessageBoxManager.GetMessageBoxCustom(new MessageBoxCustomParams

0 commit comments

Comments
 (0)