Skip to content

Commit

Permalink
Revert "This actually seems to make the lifetime management worse - w…
Browse files Browse the repository at this point in the history 
…e just dtor the WindowEmperor randomly now, which is no good"

This reverts commit 7e91bdb.
  • Loading branch information
@zadjii-msft
zadjii-msft committed Feb 9, 2023
1 parent 7e91bdb commit 0395dc4
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 29 deletions.
24 changes: 5 additions & 19 deletions src/cascadia/WindowsTerminal/WindowEmperor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,27 +155,13 @@ void WindowEmperor::CreateNewWindowThread(Remoting::WindowRequestedArgs args, co
co_await wil::resume_foreground(this->_dispatcher);
this->_checkWindowsForNotificationIcon();
});
window->Exited([this, peasant]() {
// find the window in _windows who's peasant's Id matches the peasant's Id
// and remove it
_windows.erase(std::remove_if(_windows.begin(), _windows.end(), [&](const auto& w) {
return w->Peasant().GetID() == peasant.GetID();
}),
_windows.end());
if (_windows.size() == 0)
{
_close();
}
});
auto result = window->WindowProc();
return result;

return window->WindowProc();
};
// _threads.emplace_back(func);
// LOG_IF_FAILED(SetThreadDescription(_threads.back().native_handle(), L"Window Thread"));

std::thread myWindowThread{ func };
LOG_IF_FAILED(SetThreadDescription(myWindowThread.native_handle(), L"Window Thread"));
myWindowThread.detach();
_threads.emplace_back(func);

LOG_IF_FAILED(SetThreadDescription(_threads.back().native_handle(), L"Window Thread"));
}

void WindowEmperor::_becomeMonarch()
Expand Down
7 changes: 0 additions & 7 deletions src/cascadia/WindowsTerminal/WindowThread.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,5 @@ int WindowThread::WindowProc()
TranslateMessage(&message);
DispatchMessage(&message);
}

_ExitedHandlers();
return 0;
}

winrt::Microsoft::Terminal::Remoting::Peasant WindowThread::Peasant()
{
return _peasant;
}
3 changes: 0 additions & 3 deletions src/cascadia/WindowsTerminal/WindowThread.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ class WindowThread
int WindowProc();

winrt::TerminalApp::TerminalWindow Logic();
winrt::Microsoft::Terminal::Remoting::Peasant Peasant();

WINRT_CALLBACK(Exited, winrt::delegate<>);

private:
::AppHost _host;
Expand Down

1 comment on commit 0395dc4

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@check-spelling-bot Report

🔴 Please review

See the 📜action log for details.

Unrecognized words (13) 
APeasant
Apphost
applogic
backchannel
becuase
chould
connectecd
definted
fuction
initilized
propogating
vaugely
whe
Previously acknowledged words that are now absent CLA demoable everytime Hirots inthread reingest unmark :arrow_right:
To accept ✔️ these unrecognized words as correct and remove the previously acknowledged and now absent words, run the following commands

... in a clone of the git@github.com:microsoft/terminal.git repository
on the dev/migrie/oop/3/ainulindale branch (ℹ️ how do I use this?):

curl -s -S -L 'https://github.com/raw/check-spelling/check-spelling/v0.0.21/apply.pl' |
perl - 'https://github.com/microsoft/terminal/actions/runs/4139485836/attempts/1'
Errors (1)

See the 📜action log for details.

❌ Errors Count
❌ forbidden-pattern 1

See ❌ Event descriptions for more information.

✏️ Contributor please read this

By default the command suggestion will generate a file named based on your commit. That's generally ok as long as you add the file to your commit. Someone can reorganize it later.

⚠️ The command is written for posix shells. If it doesn't work for you, you can manually add (one word per line) / remove items to expect.txt and the excludes.txt files.

If the listed items are:

  • ... misspelled, then please correct them instead of using the command.
  • ... names, please add them to .github/actions/spelling/allow/names.txt.
  • ... APIs, you can add them to a file in .github/actions/spelling/allow/.
  • ... just things you're using, please add them to an appropriate file in .github/actions/spelling/expect/.
  • ... tokens you only need in one place and shouldn't generally be used, you can add an item in an appropriate file in .github/actions/spelling/patterns/.

See the README.md in each directory for more information.

🔬 You can test your commits without appending to a PR by creating a new branch with that extra change and pushing it to your fork. The check-spelling action will run in response to your push -- it doesn't require an open pull request. By using such a branch, you can limit the number of typos your peers see you make. 😉

If the flagged items are 🤯 false positives

If items relate to a ...

  • binary file (or some other file you wouldn't want to check at all).

    Please add a file path to the excludes.txt file matching the containing file.

    File paths are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your files.

    ^ refers to the file's path from the root of the repository, so ^README\.md$ would exclude README.md (on whichever branch you're using).

  • well-formed pattern.

    If you can write a pattern that would match it,
    try adding it to the patterns.txt file.

    Patterns are Perl 5 Regular Expressions - you can test yours before committing to verify it will match your lines.

    Note that patterns can't match multiline strings.

Please sign in to comment.