RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 12:37:45 +00:00
Code Issues Activity Actions

WindowServer: Make WSButton a Weakable and stop rawly pointing to it.

Browse source 
We had a crash due to dereferencing a destroyed WSButton after clicking
a window close button. Avoid that problem by using WeakPtr.
This commit is contained in:
Andreas Kling 2019-04-06 21:16:41 +02:00
parent e74f32ae40
commit 0808d5158c
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Servers/WindowServer/WSWindowManager.h
View file

@ -100,7 +100,7 @@ public:
const WSCursor& move_cursor() const { return *m_move_cursor; }
void set_active_window(WSWindow*);
void set_cursor_tracking_button(WSButton* button) { m_cursor_tracking_button = button; }
void set_cursor_tracking_button(WSButton*);
void set_hovered_button(WSButton*);
private:
@ -207,8 +207,8 @@ private:
CircularQueue<float, 30> m_cpu_history;
String m_username;
WSButton* m_cursor_tracking_button { nullptr };
WSButton* m_hovered_button { nullptr };
WeakPtr<WSButton> m_cursor_tracking_button;
WeakPtr<WSButton> m_hovered_button;
};
template<typename Callback>