diff --git a/TsinghuaNet/MainWindow.xaml b/TsinghuaNet/MainWindow.xaml
index 729f168..05b4598 100644
--- a/TsinghuaNet/MainWindow.xaml
+++ b/TsinghuaNet/MainWindow.xaml
@@ -37,7 +37,7 @@
Auth4
Auth6
- Net
+ Net
diff --git a/TsinghuaNet/MainWindow.xaml.vb b/TsinghuaNet/MainWindow.xaml.vb
index 507e9fa..802fe39 100644
--- a/TsinghuaNet/MainWindow.xaml.vb
+++ b/TsinghuaNet/MainWindow.xaml.vb
@@ -125,18 +125,17 @@ Class MainWindow
Model.Password = log.Password
Model.State = log.State
Model.MoreInformation = log.MoreInf
- GetFlux()
Dim currentcul As CultureInfo = Thread.CurrentThread.CurrentUICulture
Model.FlowDirection = If(currentcul.TextInfo.IsRightToLeft, FlowDirection.RightToLeft, FlowDirection.LeftToRight)
- Dim langs As New List(Of CultureInfo)(Directory.GetDirectories(Directory.GetCurrentDirectory()).Select(
- Function(fullName)
- Try
- Return New CultureInfo((New DirectoryInfo(fullName).Name))
- Catch ex As CultureNotFoundException
- Return Nothing
- End Try
- End Function).Where(Function(cul) cul IsNot Nothing))
- langs.Add(New CultureInfo(""))
+ Dim langs As New List(Of CultureInfo)()
+ langs.Add(CultureInfo.InvariantCulture)
+ For Each dirname In Directory.EnumerateDirectories(Directory.GetCurrentDirectory())
+ Try
+ langs.Add(New CultureInfo((New DirectoryInfo(dirname)).Name))
+ Catch ex As CultureNotFoundException
+
+ End Try
+ Next
langs.Sort(New CultureInfoComparer(currentcul))
For i = 0 To langs.Count - 1
Model.Languages.Add(langs(i))
diff --git a/TsinghuaNet/Settings.vb b/TsinghuaNet/Settings.vb
index 60b57c3..322ae67 100644
--- a/TsinghuaNet/Settings.vb
+++ b/TsinghuaNet/Settings.vb
@@ -29,7 +29,8 @@ Class Settings
End If
End If
Dim moreinf As String = logFile...Value
- If StrComp(moreinf, "true", CompareMethod.Text) = 0 Then
+ Dim moreinfResult As Boolean
+ If Boolean.TryParse(moreinf, moreinfResult) AndAlso moreinfResult Then
Me.MoreInf = True
End If
Dim lang As String = logFile...Value