Commit 45e006ae authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Kicad: fix crash on exit, when Libedit was called during a session. It fixes... 

Kicad: fix crash on exit, when Libedit was called during a session. It fixes also a crash if Libedit was called, closed and reopened.
Happens only if eeschema was called from the Kicad manager.
parent d9c3de9b

eeschema/eeschema.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -99,8 +99,7 @@ static struct IFACE : public KIFACE_I 




        case FRAME_SCH_LIB_EDITOR:

        case FRAME_SCH_LIB_EDITOR:

            {

            {

                LIB_EDIT_FRAME* frame = new LIB_EDIT_FRAME( aKiway,

                LIB_EDIT_FRAME* frame = new LIB_EDIT_FRAME( aKiway, aParent );

                                            dynamic_cast<SCH_EDIT_FRAME*>( aParent ) );

                return frame;

                return frame;

            }

            }

            break;

            break;

eeschema/libeditframe.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -187,7 +187,7 @@ END_EVENT_TABLE() 




#define LIB_EDIT_FRAME_NAME wxT( "LibeditFrame" )

#define LIB_EDIT_FRAME_NAME wxT( "LibeditFrame" )





LIB_EDIT_FRAME::LIB_EDIT_FRAME( KIWAY* aKiway, SCH_EDIT_FRAME* aParent ) :

LIB_EDIT_FRAME::LIB_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) :

    SCH_BASE_FRAME( aKiway, aParent, FRAME_SCH_LIB_EDITOR, _( "Library Editor" ),

    SCH_BASE_FRAME( aKiway, aParent, FRAME_SCH_LIB_EDITOR, _( "Library Editor" ),

        wxDefaultPosition, wxDefaultSize, KICAD_DEFAULT_DRAWFRAME_STYLE, GetLibEditFrameName() )

        wxDefaultPosition, wxDefaultSize, KICAD_DEFAULT_DRAWFRAME_STYLE, GetLibEditFrameName() )

{

{

eeschema/libeditframe.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -122,7 +122,7 @@ class LIB_EDIT_FRAME : public SCH_BASE_FRAME 




public:

public:





    LIB_EDIT_FRAME( KIWAY* aKiway, SCH_EDIT_FRAME* aParent );

    LIB_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent );





    ~LIB_EDIT_FRAME();

    ~LIB_EDIT_FRAME();