[haiku-commits] haiku: hrev46399 - src/bin/screen_blanker
- From: jscipione@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 21 Nov 2013 01:04:33 +0100 (CET)
hrev46399 adds 1 changeset to branch 'master'
old head: 1eb5facaf43e5423e39cae752817f2d68881593e
new head: 22d74352829dc6d768e4c8c982347fe0da6d2798
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=22d7435+%5E1eb5fac
----------------------------------------------------------------------------
22d7435: screen_blanker: Check if be_app is NULL
... before using it after dynamic_cast. Fixes CID 1130496
[ John Scipione <jscipione@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev46399
Commit: 22d74352829dc6d768e4c8c982347fe0da6d2798
URL: http://cgit.haiku-os.org/haiku/commit/?id=22d7435
Author: John Scipione <jscipione@xxxxxxxxx>
Date: Thu Nov 21 00:01:24 2013 UTC
----------------------------------------------------------------------------
1 file changed, 9 insertions(+), 7 deletions(-)
src/bin/screen_blanker/ScreenSaverWindow.cpp | 16 +++++++++-------
----------------------------------------------------------------------------
diff --git a/src/bin/screen_blanker/ScreenSaverWindow.cpp
b/src/bin/screen_blanker/ScreenSaverWindow.cpp
index f617066..27ec307 100644
--- a/src/bin/screen_blanker/ScreenSaverWindow.cpp
+++ b/src/bin/screen_blanker/ScreenSaverWindow.cpp
@@ -57,13 +57,15 @@ ScreenSaverFilter::Filter(BMessage* message, BHandler**
target)
be_app->PostMessage(B_QUIT_REQUESTED);
break;
}
- } else if (message->what == B_KEY_DOWN
- &&
dynamic_cast<ScreenBlanker*>(be_app)->IsPasswordWindowShown()) {
- // Handle the escape key when the password window is showing
- const char* string = NULL;
- if (message->FindString("bytes", &string) == B_OK
- && string[0] == B_ESCAPE) {
- be_app->PostMessage(kMsgResumeSaver);
+ } else if (message->what == B_KEY_DOWN) {
+ ScreenBlanker* app = dynamic_cast<ScreenBlanker*>(be_app);
+ if (app != NULL && app->IsPasswordWindowShown()) {
+ // Handle the escape key when the password window is
showing
+ const char* string = NULL;
+ if (message->FindString("bytes", &string) == B_OK
+ && string[0] == B_ESCAPE) {
+ be_app->PostMessage(kMsgResumeSaver);
+ }
}
}
Other related posts:
- » [haiku-commits] haiku: hrev46399 - src/bin/screen_blanker - jscipione
