Fixed all known bugs.

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9272 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Phipps
2004-10-09 23:18:56 +00:00
parent a5762b3071
commit dce72ace8b
3 changed files with 11 additions and 7 deletions
+1 -1
View File
@@ -19,7 +19,7 @@ SSAwindow::SSAwindow(BRect frame) : BDirectWindow(frame, "ScreenSaver Window",
SSAwindow::~SSAwindow() SSAwindow::~SSAwindow()
{ {
Hide(); Hide();
Sync(); // Sync();
} }
+7 -5
View File
@@ -82,14 +82,14 @@ ScreenSaverApp::MessageReceived(BMessage *message)
} }
else { else {
printf ("Quitting!\n"); printf ("Quitting!\n");
Quit(); shutdown();
} }
break; break;
case 'MOO1': case 'MOO1':
if (real_time_clock()-fBlankTime>fPref.PasswordTime()) if (real_time_clock()-fBlankTime>fPref.PasswordTime())
ShowPW(); ShowPW();
else else
Quit(); shutdown();
break; break;
default: default:
BApplication::MessageReceived(message); BApplication::MessageReceived(message);
@@ -98,12 +98,14 @@ ScreenSaverApp::MessageReceived(BMessage *message)
} }
bool void
ScreenSaverApp::QuitRequested(void) ScreenSaverApp::shutdown(void)
{ {
if (fWin)
fWin->Hide();
if (fThreadID) if (fThreadID)
kill_thread(fThreadID); kill_thread(fThreadID);
if (fThrd) if (fThrd)
delete fThrd; delete fThrd;
return true; Quit();
} }
+3 -1
View File
@@ -15,7 +15,8 @@ public:
ScreenSaverApp(); ScreenSaverApp();
bool LoadAddOn(void); bool LoadAddOn(void);
void ReadyToRun(void); void ReadyToRun(void);
bool QuitRequested(void); // bool QuitRequested(void);
// void Quit(void);
virtual void MessageReceived(BMessage *message); virtual void MessageReceived(BMessage *message);
void ShowPW(void); void ShowPW(void);
private: private:
@@ -28,6 +29,7 @@ private:
thread_id fThreadID; thread_id fThreadID;
uint32 fBlankTime; uint32 fBlankTime;
void shutdown(void);
}; };
#endif //SCREEN_SAVER_H #endif //SCREEN_SAVER_H