diff --git a/.gitignore b/.gitignore index a4c47da7f..783052d74 100644 --- a/.gitignore +++ b/.gitignore @@ -314,3 +314,5 @@ Advanced Combat Tracker.exe source_dotnet5/ resources/desktop.ini + +*.lnk diff --git a/source/@MasterVersion.txt b/source/@MasterVersion.txt index 9443cc457..6caae5924 100644 --- a/source/@MasterVersion.txt +++ b/source/@MasterVersion.txt @@ -1 +1 @@ -v9.3.6 +v9.3.7 diff --git a/source/ACT.Hojoring.Common/Version.cs b/source/ACT.Hojoring.Common/Version.cs index f285eff24..69d70b317 100644 --- a/source/ACT.Hojoring.Common/Version.cs +++ b/source/ACT.Hojoring.Common/Version.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("9.3.0.6")] -[assembly: AssemblyFileVersion("9.3.0.6")] +[assembly: AssemblyVersion("9.3.0.7")] +[assembly: AssemblyFileVersion("9.3.0.7")] diff --git a/source/ACT.TTSYukkuri/ACT.TTSYukkuri.Core/Discord/Models/DiscordNetModel.cs b/source/ACT.TTSYukkuri/ACT.TTSYukkuri.Core/Discord/Models/DiscordNetModel.cs index e4b79623b..bb99d5a40 100644 --- a/source/ACT.TTSYukkuri/ACT.TTSYukkuri.Core/Discord/Models/DiscordNetModel.cs +++ b/source/ACT.TTSYukkuri/ACT.TTSYukkuri.Core/Discord/Models/DiscordNetModel.cs @@ -171,9 +171,14 @@ public void Dispose() DiscordBridge.Instance.SendMessageDelegate = null; DiscordBridge.Instance.SendSpeakingDelegate = null; - this.Disconnect(); + if (this.isConnected) + { + this.Disconnect(); + } } + private bool isConnected; + public async void Connect( bool isInitialize = false) { @@ -207,6 +212,8 @@ public async void Connect( await this.discordClient.LoginAsync(TokenType.Bot, this.Config.Token); await Task.Delay(TimeSpan.FromSeconds(0.25)); await this.discordClient.StartAsync(); + + this.isConnected = true; } catch (Exception ex) { @@ -246,6 +253,8 @@ public async void Disconnect() this.discordClient?.Dispose(); this.discordClient = null; } + + this.isConnected = false; } public async void JoinVoiceChannel() diff --git a/source/ACT.TTSYukkuri/ACT.TTSYukkuri.Core/PluginCore.cs b/source/ACT.TTSYukkuri/ACT.TTSYukkuri.Core/PluginCore.cs index 9df1132af..1fa8cdbdc 100644 --- a/source/ACT.TTSYukkuri/ACT.TTSYukkuri.Core/PluginCore.cs +++ b/source/ACT.TTSYukkuri/ACT.TTSYukkuri.Core/PluginCore.cs @@ -1,3 +1,12 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Text.RegularExpressions; +using System.Threading.Tasks; +using System.Windows.Forms; +using System.Windows.Forms.Integration; using ACT.TTSYukkuri.Config; using ACT.TTSYukkuri.Config.Views; using ACT.TTSYukkuri.Discord.Models; @@ -10,15 +19,6 @@ using FFXIV.Framework.WPF; using FFXIV.Framework.WPF.Views; using NLog; -using System; -using System.Collections.Generic; -using System.IO; -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Text.RegularExpressions; -using System.Threading.Tasks; -using System.Windows.Forms; -using System.Windows.Forms.Integration; namespace ACT.TTSYukkuri { @@ -474,8 +474,11 @@ await Task.Run(() => // CeVIOをアイコン化する if (Settings.Default.TTS == TTSType.Sasara) { - CevioTrayManager.Start(); - CevioTrayManager.ToIcon(); + if (Settings.Default.SasaraSettings.IsHideCevioWindow) + { + CevioTrayManager.Start(); + CevioTrayManager.ToIcon(); + } } if (this.PluginStatusLabel != null) @@ -521,8 +524,11 @@ public void DeInitPlugin() try { // CeVIO のアイコン化を解除する - CevioTrayManager.RestoreWindow(); - CevioTrayManager.End(); + if (Settings.Default.SasaraSettings.IsHideCevioWindow) + { + CevioTrayManager.RestoreWindow(); + CevioTrayManager.End(); + } // 設定を保存する Settings.Default.Save();