From 5796c2c3a169137fbe0b221c3a0d7f2bf61ebc12 Mon Sep 17 00:00:00 2001
From: j502647092 <jtb1@163.com>
Date: Wed, 5 Aug 2015 20:39:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95=E6=A3=80?=
 =?UTF-8?q?=E6=B5=8B=20=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Authentication/CTZAuthenticator.cs        |  2 +-
 CTZLauncher/MainWindow.xaml                   |  4 ++--
 CTZLauncher/MainWindow.xaml.cs                | 23 +++++++++----------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/CTZLauncher/Authentication/CTZAuthenticator.cs b/CTZLauncher/Authentication/CTZAuthenticator.cs
index 9c02b95..a09f7f3 100644
--- a/CTZLauncher/Authentication/CTZAuthenticator.cs
+++ b/CTZLauncher/Authentication/CTZAuthenticator.cs
@@ -68,7 +68,7 @@ namespace KMCCC.Authentication
 
         public bool getResult(string url)
         {
-            return http.Send(HttpMethod.GET, url) == "true" ? true : false;
+            return http.Send(HttpMethod.GET, url).Contains("true") ? true : false;
         }
     }
 }
diff --git a/CTZLauncher/MainWindow.xaml b/CTZLauncher/MainWindow.xaml
index ffe8d19..0862a0b 100644
--- a/CTZLauncher/MainWindow.xaml
+++ b/CTZLauncher/MainWindow.xaml
@@ -110,7 +110,7 @@
 
 
 
-        <Grid Margin="20,60,20,20" Background="White" x:Name="ServerWindow">
+        <Grid Margin="20,60,20,20" Background="White" x:Name="ServerWindow" Visibility="Hidden">
             <!--Visibility="Hidden"-->
             <Grid HorizontalAlignment="Left" Width="400" Margin="20,20,0,20">
                 <Grid Height="80" VerticalAlignment="Top" Margin="0,0,0,0">
@@ -149,7 +149,7 @@
                     </Grid>
                 </Grid>
                 <Grid HorizontalAlignment="Right" Width="300" ShowGridLines="True" Height="206" VerticalAlignment="Bottom">
-                    <Button x:Name="StartGame" BorderBrush="#FF3299CC" Content="启动游戏" Template="{StaticResource CornerButton}" Margin="10,0,10,10" Height="64" VerticalAlignment="Bottom" FontSize="16" Click="StartGame_Click" IsEnabled="False"/>
+                    <Button x:Name="StartGame" BorderBrush="#FF3299CC" Content="启动游戏" Template="{StaticResource CornerButton}" Margin="10,0,10,10" Height="64" VerticalAlignment="Bottom" FontSize="16" Click="StartGame_Click"/>
                 </Grid>
             </Grid>
         </Grid>
diff --git a/CTZLauncher/MainWindow.xaml.cs b/CTZLauncher/MainWindow.xaml.cs
index 06e41cb..97785bf 100644
--- a/CTZLauncher/MainWindow.xaml.cs
+++ b/CTZLauncher/MainWindow.xaml.cs
@@ -27,7 +27,7 @@ namespace CTZLauncher
     /// </summary>
     public partial class MainWindow : Window
     {
-        LauncherCore launcher;
+        LauncherCore launcher = null;
         public MainWindow()
         {
             InitializeComponent();
@@ -39,7 +39,7 @@ namespace CTZLauncher
             {
                 Directory.CreateDirectory(".minecraft");
             }
-            LauncherCore launcher = LauncherCore.Create(".minecraft");
+            launcher = LauncherCore.Create(".minecraft");
         }
 
         private void Window_Loaded(object sender, RoutedEventArgs e)
@@ -84,20 +84,19 @@ namespace CTZLauncher
             if (auth.isLogin())
             {
                 MessageBox.Show("当前玩家已登录!");
-                Login.IsEnabled = true;
-                return;
-            }
-            if (!auth.Login())
-            {
-                MessageBox.Show("登录失败 账号不存在 或 密码错误 !");
-                Login.IsEnabled = true;
-                return;
             }
             else
             {
-                ServerWindow.Visibility = System.Windows.Visibility.Visible;
-                return;
+                if (!auth.Login())
+                {
+                    MessageBox.Show("登录失败 账号不存在 或 密码错误 !");
+                }
+                else
+                {
+                    ServerWindow.Visibility = System.Windows.Visibility.Visible;
+                }
             }
+            Login.IsEnabled = true;
         }
 
         /// <summary>