JonKazama-Hellion/HellionChat
1
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 28 Activity

Fix #107

Browse Source
This commit is contained in:
Infi
2024-11-18 20:06:29 +01:00
parent cb7df12005
commit 56eff572b7
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChatTwo/GameFunctions/Chat.cs
+4 -3
View File
@@ -359,6 +359,7 @@ internal sealed unsafe class Chat : IDisposable
{ {
if (rotate == RotateMode.None) if (rotate == RotateMode.None)
return null; return null;
var delta = rotate switch var delta = rotate switch
{ {
RotateMode.Forward => 1, RotateMode.Forward => 1,
@@ -382,9 +383,9 @@ internal sealed unsafe class Chat : IDisposable
{ {
case InputChannel.Linkshell1 or InputChannel.CrossLinkshell1 when rotate != RotateMode.None: case InputChannel.Linkshell1 or InputChannel.CrossLinkshell1 when rotate != RotateMode.None:
{ {
// If we're activating for the first time, start at the beginning var module = UIModule.Instance();
// or end of the linkshell list depending on the rotate mode.
var currentIndex = rotate == RotateMode.Forward ? 7u : 0u; var currentIndex = channel is InputChannel.Linkshell1 ? (uint) module->LinkshellCycle : (uint) module->CrossWorldLinkshellCycle;
if (currentTempChannel != null) if (currentTempChannel != null)
{ {
switch (channel) switch (channel)
ChatTwo/Ui/ChatLogWindow.cs
+4
View File
@@ -631,6 +631,7 @@ public sealed class ChatLogWindow : Window
if (activeTab.CurrentChannel.UseTempChannel) if (activeTab.CurrentChannel.UseTempChannel)
{ {
activeTab.CurrentChannel.UseTempChannel = false; activeTab.CurrentChannel.UseTempChannel = false;
activeTab.CurrentChannel.TempChannel = InputChannel.Invalid;
SetChannel(activeTab.CurrentChannel.Channel); SetChannel(activeTab.CurrentChannel.Channel);
} }
} }
@@ -643,6 +644,7 @@ public sealed class ChatLogWindow : Window
if (activeTab.CurrentChannel.UseTempChannel) if (activeTab.CurrentChannel.UseTempChannel)
{ {
activeTab.CurrentChannel.UseTempChannel = false; activeTab.CurrentChannel.UseTempChannel = false;
activeTab.CurrentChannel.TempChannel = InputChannel.Invalid;
SetChannel(activeTab.CurrentChannel.Channel); SetChannel(activeTab.CurrentChannel.Channel);
} }
} }
@@ -667,6 +669,7 @@ public sealed class ChatLogWindow : Window
if (Plugin.CurrentTab.CurrentChannel.UseTempChannel) if (Plugin.CurrentTab.CurrentChannel.UseTempChannel)
{ {
Plugin.CurrentTab.CurrentChannel.UseTempChannel = false; Plugin.CurrentTab.CurrentChannel.UseTempChannel = false;
activeTab.CurrentChannel.TempChannel = InputChannel.Invalid;
SetChannel(Plugin.CurrentTab.CurrentChannel.Channel); SetChannel(Plugin.CurrentTab.CurrentChannel.Channel);
} }
} }
@@ -900,6 +903,7 @@ public sealed class ChatLogWindow : Window
activeTab.CurrentChannel.UseTempChannel = false; activeTab.CurrentChannel.UseTempChannel = false;
if (activeTab.CurrentChannel.TempChannel is InputChannel.Tell) if (activeTab.CurrentChannel.TempChannel is InputChannel.Tell)
activeTab.CurrentChannel.TellTarget = null; activeTab.CurrentChannel.TellTarget = null;
activeTab.CurrentChannel.TempChannel = InputChannel.Invalid;
Chat = string.Empty; Chat = string.Empty;
return; return;