Skip to content

Commit

Permalink
Merge pull request #385 from wbonbon/master
Browse files Browse the repository at this point in the history
downgrade reference
  • Loading branch information
wbonbon committed Jan 15, 2024
2 parents d946803 + c277c35 commit 5a15b16
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 17 deletions.
2 changes: 1 addition & 1 deletion source/@MasterVersion.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v10.2.6
v10.2.7
4 changes: 2 additions & 2 deletions source/ACT.Hojoring.Common/Version.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Reflection;

[assembly: AssemblyVersion("10.2.0.6")]
[assembly: AssemblyFileVersion("10.2.0.6")]
[assembly: AssemblyVersion("10.2.0.7")]
[assembly: AssemblyFileVersion("10.2.0.7")]
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@
<Version>4.3.0</Version>
</PackageReference>
<PackageReference Include="System.Collections.Immutable">
<Version>8.0.0</Version>
<Version>5.0.0</Version>
</PackageReference>
<PackageReference Include="System.ComponentModel">
<Version>4.3.0</Version>
Expand Down
24 changes: 11 additions & 13 deletions source/ACT.TTSYukkuri/ACT.TTSYukkuri.Core/PluginCore.cs
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,17 @@ public void PlaySound(string wave, int volume)
this.StartReplaceTTSMethodTimer();

// DISCORD BOTの初期化もう少し後に行う
// 移動
await Task.Run(() =>
{
// DISCORD BOT クライアントを初期化する
DiscordClientModel.Model.Initialize();
// AutoJoinがONならば接続する
if (Settings.Default.DiscordSettings.AutoJoin)
{
DiscordClientModel.Model.Connect(true);
}
});

await Task.Run(() =>
{
Expand Down Expand Up @@ -482,18 +492,6 @@ public void PlaySound(string wave, int volume)
}
}

await Task.Run(() =>
{
// DISCORD BOT クライアントを初期化する
DiscordClientModel.Model.Initialize();
// AutoJoinがONならば接続する
if (Settings.Default.DiscordSettings.AutoJoin)
{
DiscordClientModel.Model.Connect(true);
}
});

if (this.PluginStatusLabel != null)
{
this.PluginStatusLabel.Text = "Plugin Started";
Expand Down

0 comments on commit 5a15b16

Please sign in to comment.