Skip to content

Commit

Permalink
it builds again
Browse files Browse the repository at this point in the history
  • Loading branch information
zadjii-msft committed Apr 13, 2022
1 parent 9688573 commit e7c95d2
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
1 change: 0 additions & 1 deletion src/cascadia/TerminalApp/AppLogic.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1629,5 +1629,4 @@ namespace winrt::TerminalApp::implementation
{
return _settings.GlobalSettings().ShowTitleInTitlebar();
}

}
1 change: 0 additions & 1 deletion src/host/PtySignalInputThread.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ namespace Microsoft::Console
PtySignalInputThread& operator=(const PtySignalInputThread&) = delete;

void ConnectConsole() noexcept;
void StartPseudoWindowIfNeeded();

private:
enum class PtySignal : unsigned short
Expand Down
5 changes: 5 additions & 0 deletions src/host/VtIo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,11 @@ bool VtIo::IsUsingVt() const

if (_pPtySignalInputThread)
{
// IMPORTANT! Start the pseudo window on this thread. This thread has a
// message pump. If you DON'T, then a DPI change in the owning hwnd will
// cause us to get a dpi change as well, which we'll never deque and
// handle, effectively HANGING THE OWNER HWND.
//
// Let the signal thread know that the console is connected
_pPtySignalInputThread->ConnectConsole();
}
Expand Down
4 changes: 2 additions & 2 deletions src/host/outputStream.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -939,8 +939,8 @@ void ConhostInternalGetSet::FocusChanged(const bool focused)
// Get the PID of the current FG window, and compare with our owner's PID.
DWORD currentFgPid{ 0 };
DWORD ownerPid{ 0 };
const auto currentFgThreadId{ GetWindowThreadProcessId(currentFgWindow, &currentFgPid) };
const auto ownerThreadId{ GetWindowThreadProcessId(ownerHwnd, &ownerPid) };
GetWindowThreadProcessId(currentFgWindow, &currentFgPid);
GetWindowThreadProcessId(ownerHwnd, &ownerPid);

if (ownerPid == currentFgPid)
{
Expand Down

1 comment on commit e7c95d2

@github-actions

This comment was marked as resolved.

Please sign in to comment.