Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix code that could lead to a possible deadlock. #1380

Merged
merged 6 commits into from
Mar 20, 2022
+15 −11
Merged

Fix code that could lead to a possible deadlock. #1380

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9673b8f
Fix code that could lead to a possible deadlock.
DusterTheFirst Mar 19, 2022
5ef68ac
Fix code that may cause a deadlock in `MenuRoot::stationary_interaction`
DusterTheFirst Mar 19, 2022
11ed9f2
Reference this PR from comments in the code for future maintainers
DusterTheFirst Mar 19, 2022
7a0ccfd
Add the change to the changelog
DusterTheFirst Mar 19, 2022
7d393c1
Use full link to PR
emilk Mar 20, 2022
7e820d9
Use full link to PR
emilk Mar 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use full link to PR
@emilk
emilk authored Mar 20, 2022

Verified

This commit was signed with the committer’s verified signature.
noahd1 Noah Davis
SSH Key Fingerprint: xAGNpTBCUXc+U83ya4fR3kzS7RaNLB4pw608eb+ZEIU
Verified
Learn about vigilant mode
commit 7d393c14c5d0c0d3f5987cfa440a2d47f0d293c1
2 changes: 1 addition & 1 deletion egui/src/menu.rs
View file
Original file line number Diff line number Diff line change
@@ -277,7 +277,7 @@ impl MenuRoot {
root: &mut MenuRootManager,
id: Id,
) -> MenuResponse {
// Lock the input once for the whole function call (see #1380)
// Lock the input once for the whole function call (see https://github.com/emilk/egui/pull/1380).
let input = response.ctx.input();

if (response.clicked() && root.is_menu_open(id)) || input.key_pressed(Key::Escape) {