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

Make sure GL canvas is visible upon destruction in Module properties dialogs.

This commit is contained in:
Maciej Suminski 2016-06-14 12:08:35 +02:00
parent b82ccc3b4e
commit 7ff3dd0807
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp
View File

@ -96,8 +96,6 @@ DIALOG_MODULE_BOARD_EDITOR::DIALOG_MODULE_BOARD_EDITOR( PCB_EDIT_FRAME* aParent
DIALOG_MODULE_BOARD_EDITOR::~DIALOG_MODULE_BOARD_EDITOR() DIALOG_MODULE_BOARD_EDITOR::~DIALOG_MODULE_BOARD_EDITOR()
{ {
m_page = m_NoteBook->GetSelection();
for( unsigned ii = 0; ii < m_Shapes3D_list.size(); ii++ ) for( unsigned ii = 0; ii < m_Shapes3D_list.size(); ii++ )
delete m_Shapes3D_list[ii]; delete m_Shapes3D_list[ii];
@ -107,6 +105,12 @@ DIALOG_MODULE_BOARD_EDITOR::~DIALOG_MODULE_BOARD_EDITOR()
// browsed but not used would consume memory // browsed but not used would consume memory
Prj().Get3DCacheManager()->FlushCache( false ); Prj().Get3DCacheManager()->FlushCache( false );
// the GL canvas has to be visible before it is destroyed
m_page = m_NoteBook->GetSelection();
m_NoteBook->SetSelection( 1 );
delete m_PreviewPane;
m_PreviewPane = NULL; // just in case, to avoid double-free
delete m_ReferenceCopy; delete m_ReferenceCopy;
delete m_ValueCopy; delete m_ValueCopy;
} }

8
pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp
View File

@ -89,8 +89,6 @@ DIALOG_MODULE_MODULE_EDITOR::DIALOG_MODULE_MODULE_EDITOR( FOOTPRINT_EDIT_FRAME*
DIALOG_MODULE_MODULE_EDITOR::~DIALOG_MODULE_MODULE_EDITOR() DIALOG_MODULE_MODULE_EDITOR::~DIALOG_MODULE_MODULE_EDITOR()
{ {
m_page = m_NoteBook->GetSelection();
for( unsigned ii = 0; ii < m_shapes3D_list.size(); ii++ ) for( unsigned ii = 0; ii < m_shapes3D_list.size(); ii++ )
delete m_shapes3D_list[ii]; delete m_shapes3D_list[ii];
@ -100,6 +98,12 @@ DIALOG_MODULE_MODULE_EDITOR::~DIALOG_MODULE_MODULE_EDITOR()
// browsed but not used would consume memory // browsed but not used would consume memory
Prj().Get3DCacheManager()->FlushCache( false ); Prj().Get3DCacheManager()->FlushCache( false );
// the GL canvas has to be visible before it is destroyed
m_page = m_NoteBook->GetSelection();
m_NoteBook->SetSelection( 1 );
delete m_PreviewPane;
m_PreviewPane = NULL; // just in case, to avoid double-free
delete m_referenceCopy; delete m_referenceCopy;
delete m_valueCopy; delete m_valueCopy;
} }