Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-22 19:56:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #335 from mitchellh/null-focus

Browse Source 
core: set focused surface pointer to null if matches on delete
This commit is contained in:
Mitchell Hashimoto
2023-08-25 21:08:16 -07:00
committed by GitHub
parent 134568c395 6a8d302fa0
commit 73ff43590c
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/App.zig
View File

@ -139,6 +139,16 @@ pub fn addSurface(self: *App, rt_surface: *apprt.Surface) !void {
/// Delete the surface from the known surface list. This will NOT call the /// Delete the surface from the known surface list. This will NOT call the
/// destructor or free the memory. /// destructor or free the memory.
pub fn deleteSurface(self: *App, rt_surface: *apprt.Surface) void { pub fn deleteSurface(self: *App, rt_surface: *apprt.Surface) void {
// If this surface is the focused surface then we need to clear it.
// There was a bug where we relied on hasSurface to return false and
// just let focused surface be but the allocator was reusing addresses
// after free and giving false positives, so we must clear it.
if (self.focused_surface) |focused| {
if (focused == &rt_surface.core_surface) {
self.focused_surface = null;
}
}
var i: usize = 0; var i: usize = 0;
while (i < self.surfaces.items.len) { while (i < self.surfaces.items.len) {
if (self.surfaces.items[i] == rt_surface) { if (self.surfaces.items[i] == rt_surface) {