Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Now shows the "Reboot" button after the actual shutdown attempt.

Browse Source 
The invalidate work-around is no longer needed for the app_server.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16083 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2006-01-25 16:24:17 +00:00
parent 76c7d59103
commit 01e69aca05
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/servers/registrar/ShutdownProcess.cpp
View File

@ -490,8 +490,6 @@ public:
fCancelShutdownButton->Hide(); fCancelShutdownButton->Hide();
fRebootSystemButton->MakeDefault(true); fRebootSystemButton->MakeDefault(true);
fRebootSystemButton->Show(); fRebootSystemButton->Show();
// TODO: Temporary work-around for a Haiku bug.
fRebootSystemButton->Invalidate();
SetTitle("System is Shut Down"); SetTitle("System is Shut Down");
fTextView->SetText("It's now safe to turn off the computer."); fTextView->SetText("It's now safe to turn off the computer.");
@ -1285,8 +1283,8 @@ ShutdownProcess::_WorkerDoShutdown()
// we're through: do the shutdown // we're through: do the shutdown
_SetPhase(DONE_PHASE); _SetPhase(DONE_PHASE);
_SetShutdownWindowWaitForShutdown();
_ShutDown(); _ShutDown();
_SetShutdownWindowWaitForShutdown();
PRINT((" _kern_shutdown() failed\n")); PRINT((" _kern_shutdown() failed\n"));
@ -1307,7 +1305,7 @@ ShutdownProcess::_WorkerDoShutdown()
_kern_shutdown(true); _kern_shutdown(true);
#endif #endif
} }
// either there's no GUI or reboot failed: we enter the kernel debugger // either there's no GUI or reboot failed: we enter the kernel debugger
// instead // instead
#ifdef __HAIKU__ #ifdef __HAIKU__