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

Clear the playerFrame lookup cache when closing frames. 

WindowIds aren't actually guaranteed to be unique, and we don't
perform a dynamic_cast on the result of FindWindowById() because
of linker issues....

This is an attempt to fix KICAD-39.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/14928

(cherry picked from commit d6aefc458c)
This commit is contained in:
Jeff Young 2023-06-11 20:30:52 +01:00
parent 7b1e75e6ed
commit 370bdef8d0
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/kiway.cpp
View File

@ -495,7 +495,7 @@ bool KIWAY::PlayerClose( FRAME_T aFrameType, bool doForce )
return false; return false;
} }
KIWAY_PLAYER* frame = GetPlayerFrame( aFrameType ); KIWAY_PLAYER* frame = GetPlayerFrame( aFrameType );
if( frame == nullptr ) // Already closed if( frame == nullptr ) // Already closed
return true; return true;
@ -523,14 +523,18 @@ bool KIWAY::PlayersClose( bool doForce )
bool ret = true; bool ret = true;
for( unsigned i=0; i < KIWAY_PLAYER_COUNT; ++i ) for( unsigned i=0; i < KIWAY_PLAYER_COUNT; ++i )
{
ret = ret && PlayerClose( FRAME_T( i ), doForce ); ret = ret && PlayerClose( FRAME_T( i ), doForce );
}
return ret; return ret;
} }
void KIWAY::PlayerDidClose( FRAME_T aFrameType )
{
m_playerFrameId[aFrameType] = wxID_NONE;
}
void KIWAY::ExpressMail( FRAME_T aDestination, MAIL_T aCommand, std::string& aPayload, void KIWAY::ExpressMail( FRAME_T aDestination, MAIL_T aCommand, std::string& aPayload,
wxWindow* aSource ) wxWindow* aSource )
{ {

2
common/kiway_player.cpp
View File

@ -169,6 +169,8 @@ bool KIWAY_PLAYER::ShowModal( wxString* aResult, wxWindow* aResultantFocusWindow
bool KIWAY_PLAYER::Destroy() bool KIWAY_PLAYER::Destroy()
{ {
Kiway().PlayerDidClose( GetFrameType() );
return EDA_BASE_FRAME::Destroy(); return EDA_BASE_FRAME::Destroy();
} }

10
include/kiway.h
View File

@ -358,6 +358,11 @@ public:
*/ */
virtual bool PlayersClose( bool doForce ); virtual bool PlayersClose( bool doForce );
/**
* Notifies a Kiway that a player has been closed.
*/
void PlayerDidClose( FRAME_T aFrameType );
/** /**
* Send @a aPayload to @a aDestination from @a aSource. * Send @a aPayload to @a aDestination from @a aSource.
* *
@ -434,11 +439,6 @@ private:
/// Get the [path &] name of the DSO holding the requested FACE_T. /// Get the [path &] name of the DSO holding the requested FACE_T.
const wxString dso_search_path( FACE_T aFaceId ); const wxString dso_search_path( FACE_T aFaceId );
#if 0
/// hooked into m_top in SetTop(), marks child frame as closed.
void player_destroy_handler( wxWindowDestroyEvent& event );
#endif
bool set_kiface( FACE_T aFaceType, KIFACE* aKiface ) bool set_kiface( FACE_T aFaceType, KIFACE* aKiface )
{ {
if( (unsigned) aFaceType < (unsigned) KIWAY_FACE_COUNT ) if( (unsigned) aFaceType < (unsigned) KIWAY_FACE_COUNT )