perso
/
finalcut
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix: Dereference of null pointer in transparent.cpp

This commit is contained in:
Markus Gans 2016-10-02 21:42:14 +02:00
parent 1231b9f65d
commit a2d69f5e7b
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
test/transparent.cpp
View File

@ -105,15 +105,18 @@ void Transparent::draw()
//----------------------------------------------------------------------
void Transparent::onKeyPress (FKeyEvent* ev)
{
if ( ev && ev->key() == 'q' && getParentWidget() )
if ( ev )
{
if ( getParentWidget()->close() )
ev->accept();
if ( ev->key() == 'q' && getParentWidget() )
{
if ( getParentWidget()->close() )
ev->accept();
else
ev->ignore();
}
else
ev->ignore();
FDialog::onKeyPress(ev);
}
else
FDialog::onKeyPress(ev);
}
@ -144,13 +147,16 @@ class MainWindow : public FDialog
void onTimer (FTimerEvent*);
void onKeyPress (FKeyEvent* ev)
{
if ( ev && ev->key() == 'q' )
if ( ev )
{
close();
ev->accept();
if ( ev->key() == 'q' )
{
close();
ev->accept();
}
else
FDialog::onKeyPress(ev);
}
else
FDialog::onKeyPress(ev);
}
public: