Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix crash on setting the accelerator table in wxQt

Browse Source 
Check whether m_qtShortcuts is non-null before dereferencing it.

Closes https://github.com/wxWidgets/wxWidgets/pull/1040
This commit is contained in:
Liam Treacy
2018-12-03 16:02:21 +00:00
committed by Vadim Zeitlin
parent 5e089badc0
commit 94a58121f7
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/qt/window.cpp
View File

@@ -936,13 +936,17 @@ void wxWindowQt::SetAcceleratorTable( const wxAcceleratorTable& accel )
{ {
wxWindowBase::SetAcceleratorTable( accel ); wxWindowBase::SetAcceleratorTable( accel );
// Disable previously set accelerators if ( m_qtShortcuts )
while ( !m_qtShortcuts->isEmpty() ) {
delete m_qtShortcuts->takeFirst(); // Disable previously set accelerators
while ( !m_qtShortcuts->isEmpty() )
delete m_qtShortcuts->takeFirst();
// Create new shortcuts (use GetHandle() so all events inside
// the window are handled, not only in the container subwindow)
delete m_qtShortcuts;
}
// Create new shortcuts (use GetHandle() so all events inside
// the window are handled, not only in the container subwindow)
delete m_qtShortcuts;
m_qtShortcuts = accel.ConvertShortcutTable( GetHandle() ); m_qtShortcuts = accel.ConvertShortcutTable( GetHandle() );
// Connect shortcuts to window // Connect shortcuts to window