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

10
test/transparent.cpp
View File

@ -105,7 +105,9 @@ void Transparent::draw()
//---------------------------------------------------------------------- //----------------------------------------------------------------------
void Transparent::onKeyPress (FKeyEvent* ev) void Transparent::onKeyPress (FKeyEvent* ev)
{ {
if ( ev && ev->key() == 'q' && getParentWidget() ) if ( ev )
{
if ( ev->key() == 'q' && getParentWidget() )
{ {
if ( getParentWidget()->close() ) if ( getParentWidget()->close() )
ev->accept(); ev->accept();
@ -115,6 +117,7 @@ void Transparent::onKeyPress (FKeyEvent* ev)
else else
FDialog::onKeyPress(ev); FDialog::onKeyPress(ev);
} }
}
//---------------------------------------------------------------------- //----------------------------------------------------------------------
@ -144,7 +147,9 @@ class MainWindow : public FDialog
void onTimer (FTimerEvent*); void onTimer (FTimerEvent*);
void onKeyPress (FKeyEvent* ev) void onKeyPress (FKeyEvent* ev)
{ {
if ( ev && ev->key() == 'q' ) if ( ev )
{
if ( ev->key() == 'q' )
{ {
close(); close();
ev->accept(); ev->accept();
@ -152,6 +157,7 @@ class MainWindow : public FDialog
else else
FDialog::onKeyPress(ev); FDialog::onKeyPress(ev);
} }
}
public: public:
// Constructor // Constructor