Skip to content

Commit 4be635b

Browse files
committed
Remove ClearState log
1 parent b910ebc commit 4be635b

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

Dalamud/Interface/Internal/DalamudIme.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ private void ClearState(HIMC hImc)
439439
ref var textState = ref TextState;
440440
textState.Stb.Cursor = textState.Stb.SelectStart = textState.Stb.SelectEnd;
441441

442-
Log.Information($"{nameof(this.ClearState)}");
442+
// Log.Information($"{nameof(this.ClearState)}");
443443
}
444444

445445
private void LoadCand(HIMC hImc)

Dalamud/Interface/Internal/WndProcHookManager.cs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,19 +112,21 @@ private unsafe LRESULT WndProcDetour(HWND hwnd, uint uMsg, WPARAM wParam, LPARAM
112112

113113
if (uMsg == this.unhookSelfMessage)
114114
{
115-
// Remove self from the chain.
116-
SetWindowLongPtrW(hwnd, GWLP.GWLP_WNDPROC, nextProc);
117-
lock (this.wndProcNextDict)
118-
this.wndProcNextDict.Remove(hwnd);
119-
120115
// Even though this message is dedicated for our processing,
121116
// satisfy the expectations by calling the next window procedure.
122-
return CallWindowProcW(
117+
var rv = CallWindowProcW(
123118
(delegate* unmanaged<HWND, uint, WPARAM, LPARAM, LRESULT>)nextProc,
124119
hwnd,
125120
uMsg,
126121
wParam,
127122
lParam);
123+
124+
// Remove self from the chain.
125+
SetWindowLongPtrW(hwnd, GWLP.GWLP_WNDPROC, nextProc);
126+
lock (this.wndProcNextDict)
127+
this.wndProcNextDict.Remove(hwnd);
128+
129+
return rv;
128130
}
129131

130132
var arg = new WndProcOverrideEventArgs(hwnd, ref uMsg, ref wParam, ref lParam);

0 commit comments

Comments
 (0)