diff --git a/JianGongYun/App.xaml b/JianGongYun/App.xaml index 0b1630d..22464e1 100644 --- a/JianGongYun/App.xaml +++ b/JianGongYun/App.xaml @@ -11,8 +11,8 @@ - - + + diff --git a/JianGongYun/JianGongYun.csproj b/JianGongYun/JianGongYun.csproj index 1babd1e..ca99c2c 100644 --- a/JianGongYun/JianGongYun.csproj +++ b/JianGongYun/JianGongYun.csproj @@ -10,6 +10,7 @@ WinExe AnyCPU;x64;x86 + sznykt diff --git a/JianGongYun/MainWindow.xaml.cs b/JianGongYun/MainWindow.xaml.cs index c63c8df..c4555b5 100644 --- a/JianGongYun/MainWindow.xaml.cs +++ b/JianGongYun/MainWindow.xaml.cs @@ -26,7 +26,7 @@ namespace JianGongYun public MainWindow() { InitializeComponent(); - this.Closed += delegate { Application.Current.Shutdown(); }; + this.Closed += delegate { Environment.Exit(0); }; Theme.ColorChange += delegate { // 不要通过XAML来绑定颜色,无法获取到通知 diff --git a/JianGongYun/TRTC/LiveClassroom.cs b/JianGongYun/TRTC/LiveClassroom.cs index f1c3c3a..9d64b45 100644 --- a/JianGongYun/TRTC/LiveClassroom.cs +++ b/JianGongYun/TRTC/LiveClassroom.cs @@ -730,11 +730,12 @@ namespace JianGongYun.TRTC //if (CallerWindow == null) //{ // //关闭程序 - // Application.Current.Shutdown(); + // Environment.Exit(0); // return; //} //CallerWindow.Close();//直接关闭 - Application.Current.Shutdown(); + Environment.Exit(0); + } diff --git a/JianGongYun/Views/Login.xaml.cs b/JianGongYun/Views/Login.xaml.cs index 6f67f2c..8e43ce1 100644 --- a/JianGongYun/Views/Login.xaml.cs +++ b/JianGongYun/Views/Login.xaml.cs @@ -67,7 +67,7 @@ namespace JianGongYun.Views if (!string.IsNullOrWhiteSpace(errMsg)) { MessageBox.Show(errMsg, "错误", MessageBoxButton.OKCancel, MessageBoxImage.Error); - Application.Current.Shutdown(); + Environment.Exit(0); return; } LiveClassroom.EnterTheClassroom(Window.GetWindow(this), diff --git a/JianGongYun/logo.ico b/JianGongYun/logo.ico index 92a4536..cf27d13 100644 Binary files a/JianGongYun/logo.ico and b/JianGongYun/logo.ico differ