haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash in wxSocketBase when the event handler has been destroyed. 

Fixes KICAD-37B
Fixes https://gitlab.com/kicad/code/kicad/-/issues/18234


(cherry picked from commit ebdfeb4c0a)

Co-authored-by: Alex Shvartzkop <dudesuchamazing@gmail.com>
This commit is contained in:
dsa-t 2024-06-18 21:50:18 +00:00
parent 02502342a5
commit c5056beeb3
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
common/kiway_player.cpp
View File

@ -57,7 +57,6 @@ KIWAY_PLAYER::KIWAY_PLAYER( KIWAY* aKiway, wxWindow* aParent, FRAME_T aFrameType
KIWAY_PLAYER::~KIWAY_PLAYER() throw() KIWAY_PLAYER::~KIWAY_PLAYER() throw()
{ {
// socket server must be destructed before we complete // socket server must be destructed before we complete
// destructing the frame or else we could crash // destructing the frame or else we could crash
// as the socket server holds a reference to this frame // as the socket server holds a reference to this frame
@ -69,6 +68,20 @@ KIWAY_PLAYER::~KIWAY_PLAYER() throw()
delete m_socketServer; delete m_socketServer;
m_socketServer = nullptr; m_socketServer = nullptr;
} }
// remove active sockets as well
for( wxSocketBase* socket : m_sockets )
{
if( !socket )
continue;
// ensure any event handling stops
socket->Notify( false );
delete socket;
}
m_sockets.clear();
} }