Windows: Fix crashes when all global hotkeys are disabled (issue #1184)

This commit is contained in:
Abs62 2019-08-07 22:54:49 +03:00
parent a722b3f43d
commit c53fe1c640

View file

@ -2858,7 +2858,7 @@ void MainWindow::toggleMainWindow( bool onlyShow )
show(); show();
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
if( hotkeyWrapper->handleViaDLL() ) if( !!( hotkeyWrapper ) && hotkeyWrapper->handleViaDLL() )
{ {
// Some dances with tambourine // Some dances with tambourine
HWND wId = (HWND) winId(); HWND wId = (HWND) winId();
@ -2895,7 +2895,7 @@ void MainWindow::toggleMainWindow( bool onlyShow )
{ {
qApp->setActiveWindow( this ); qApp->setActiveWindow( this );
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
if( hotkeyWrapper->handleViaDLL() ) if( !!( hotkeyWrapper ) && hotkeyWrapper->handleViaDLL() )
{ {
// Some dances with tambourine // Some dances with tambourine
HWND wId = (HWND) winId(); HWND wId = (HWND) winId();