migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-09-02 14:50:03 -04:00
Code Activity

Fix crash when closing end opening a viewport really fast

Browse Source 
The problem was that a lot of stuff was tring to acces the viewport after was destroyed!
Now the viewport data from Memory will only be cleared when a new frame beagins!
This commit is contained in:
Konkitoman
2023-11-13 15:24:30 +02:00
parent 960ef20e47
commit 7c251a599c
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/egui/src/context.rs
View File

@@ -226,6 +226,7 @@ impl ContextImpl {
self.memory.begin_frame( self.memory.begin_frame(
self.input.get(&viewport_id).unwrap_or(&Default::default()), self.input.get(&viewport_id).unwrap_or(&Default::default()),
&new_raw_input, &new_raw_input,
&ViewportIdSet::from_iter(self.viewports.keys().cloned().chain([ViewportId::ROOT])),
); );
let input = self let input = self
@@ -1476,7 +1477,6 @@ impl Context {
let textures_delta = self.write(|ctx| { let textures_delta = self.write(|ctx| {
ctx.memory.end_frame( ctx.memory.end_frame(
&ctx.input[&ctx.viewport_id()], &ctx.input[&ctx.viewport_id()],
&viewports,
&ctx.frame_state &ctx.frame_state
.entry(ctx.viewport_id()) .entry(ctx.viewport_id())
.or_default() .or_default()

18
crates/egui/src/memory.rs
View File

@@ -550,9 +550,16 @@ impl Memory {
&mut self, &mut self,
prev_input: &crate::input_state::InputState, prev_input: &crate::input_state::InputState,
new_input: &crate::data::input::RawInput, new_input: &crate::data::input::RawInput,
viewports: &ViewportIdSet,
) { ) {
crate::profile_function!(); crate::profile_function!();
// Cleanup
self.interactions.retain(|id, _| viewports.contains(id));
self.areas.retain(|id, _| viewports.contains(id));
self.window_interactions
.retain(|id, _| viewports.contains(id));
self.viewport_id = new_input.viewport.id_pair.this; self.viewport_id = new_input.viewport.id_pair.this;
self.interactions self.interactions
.entry(self.viewport_id) .entry(self.viewport_id)
@@ -565,20 +572,11 @@ impl Memory {
} }
} }
pub(crate) fn end_frame( pub(crate) fn end_frame(&mut self, input: &InputState, used_ids: &IdMap<Rect>) {
&mut self,
input: &InputState,
viewports: &ViewportIdSet,
used_ids: &IdMap<Rect>,
) {
self.caches.update(); self.caches.update();
self.areas_mut().end_frame(); self.areas_mut().end_frame();
self.interaction_mut().focus.end_frame(used_ids); self.interaction_mut().focus.end_frame(used_ids);
self.drag_value.end_frame(input); self.drag_value.end_frame(input);
self.interactions.retain(|id, _| viewports.contains(id));
self.areas.retain(|id, _| viewports.contains(id));
self.window_interactions
.retain(|id, _| viewports.contains(id));
} }
pub(crate) fn set_viewport_id(&mut self, viewport_id: ViewportId) { pub(crate) fn set_viewport_id(&mut self, viewport_id: ViewportId) {