From 7008829b0f31b1407d6e1394525765da88d9763f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= Date: Wed, 12 Apr 2006 19:35:54 +0000 Subject: [PATCH] fixed some uninited members and locks git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@17114 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/bin/screen_blanker/PasswordWindow.cpp | 2 +- src/bin/screen_blanker/PasswordWindow.h | 4 +-- src/bin/screen_blanker/SSAwindow.cpp | 2 +- src/bin/screen_blanker/ScreenSaverApp.cpp | 39 +++++++++++++---------- src/bin/screen_blanker/ScreenSaverApp.h | 2 +- 5 files changed, 27 insertions(+), 22 deletions(-) diff --git a/src/bin/screen_blanker/PasswordWindow.cpp b/src/bin/screen_blanker/PasswordWindow.cpp index 1c4f12160a..7a38ca6a3f 100644 --- a/src/bin/screen_blanker/PasswordWindow.cpp +++ b/src/bin/screen_blanker/PasswordWindow.cpp @@ -4,7 +4,7 @@ * * Authors: * Michael Phipps - * J閞鬽e Duval, jerome.duval@free.fr + * J茅r么me Duval, jerome.duval@free.fr */ #include #include diff --git a/src/bin/screen_blanker/PasswordWindow.h b/src/bin/screen_blanker/PasswordWindow.h index be8c03fb73..1d5d7b14ba 100644 --- a/src/bin/screen_blanker/PasswordWindow.h +++ b/src/bin/screen_blanker/PasswordWindow.h @@ -4,7 +4,7 @@ * * Authors: * Michael Phipps - * J閞鬽e Duval, jerome.duval@free.fr + * J茅r么me Duval, jerome.duval@free.fr */ #ifndef PASSWORDWINDOW_H @@ -26,7 +26,7 @@ class PasswordWindow : public BWindow void Setup(void); const char *GetPassword(void) {return fPassword->Text();} - void SetPassword(const char* text) { Lock(); fPassword->SetText(text); fPassword->MakeFocus(true); Unlock(); } + void SetPassword(const char* text) { if (Lock()) { fPassword->SetText(text); fPassword->MakeFocus(true); Unlock();} } bool fDie; private: diff --git a/src/bin/screen_blanker/SSAwindow.cpp b/src/bin/screen_blanker/SSAwindow.cpp index 3a4e98aec4..9b7ca8656c 100644 --- a/src/bin/screen_blanker/SSAwindow.cpp +++ b/src/bin/screen_blanker/SSAwindow.cpp @@ -4,7 +4,7 @@ * * Authors: * Michael Phipps - * J閞鬽e Duval, jerome.duval@free.fr + * J茅r么me Duval, jerome.duval@free.fr */ #include "SSAwindow.h" #include diff --git a/src/bin/screen_blanker/ScreenSaverApp.cpp b/src/bin/screen_blanker/ScreenSaverApp.cpp index 4db78e5e15..7ceb5b32d1 100755 --- a/src/bin/screen_blanker/ScreenSaverApp.cpp +++ b/src/bin/screen_blanker/ScreenSaverApp.cpp @@ -4,7 +4,7 @@ * * Authors: * Michael Phipps - * J閞鬽e Duval, jerome.duval@free.fr + * J茅r么me Duval, jerome.duval@free.fr */ #include #include @@ -36,6 +36,9 @@ int main(int, char**) ScreenSaverApp::ScreenSaverApp() : BApplication(SCREEN_BLANKER_SIG), fWin(NULL), + fSaver(NULL), + fThrd(NULL), + fPww(NULL), fThreadID(-1), fRunner(NULL) { @@ -73,16 +76,17 @@ ScreenSaverApp::ReadyToRun() void ScreenSaverApp::ShowPW() { - fWin->Lock(); - if (fThreadID > -1) - suspend_thread(fThreadID); - if (B_OK==fWin->SetFullScreen(false)) { - fWin->Sync(); - ShowCursor(); - fPww->Show(); - fPww->Sync(); + if (fWin->Lock()) { + if (fThreadID > -1) + suspend_thread(fThreadID); + if (B_OK==fWin->SetFullScreen(false)) { + fWin->Sync(); + ShowCursor(); + fPww->Show(); + fPww->Sync(); + } + fWin->Unlock(); } - fWin->Unlock(); delete fRunner; fRunner = new BMessageRunner(BMessenger(this), new BMessage(RESUME_SAVER), fPref.BlankTime(), 1); if (fRunner->InitCheck() != B_OK) { @@ -112,14 +116,15 @@ ScreenSaverApp::MessageReceived(BMessage *message) break; } case RESUME_SAVER: - fWin->Lock(); - if (B_OK==fWin->SetFullScreen(true)) { - HideCursor(); - fPww->Hide(); + if (fWin->Lock()) { + if (B_OK==fWin->SetFullScreen(true)) { + HideCursor(); + fPww->Hide(); + } + if (fThreadID > -1) + resume_thread(fThreadID); + fWin->Unlock(); } - if (fThreadID > -1) - resume_thread(fThreadID); - fWin->Unlock(); default: BApplication::MessageReceived(message); break; diff --git a/src/bin/screen_blanker/ScreenSaverApp.h b/src/bin/screen_blanker/ScreenSaverApp.h index 8324c655ce..552754440a 100755 --- a/src/bin/screen_blanker/ScreenSaverApp.h +++ b/src/bin/screen_blanker/ScreenSaverApp.h @@ -4,7 +4,7 @@ * * Authors: * Michael Phipps - * J閞鬽e Duval, jerome.duval@free.fr + * J茅r么me Duval, jerome.duval@free.fr */ #ifndef SCREEN_SAVER_APP_H