From 01e69aca05bf3a5c01287fc3f67204de0d0b8d5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 25 Jan 2006 16:24:17 +0000 Subject: [PATCH] Now shows the "Reboot" button after the actual shutdown attempt. 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 --- src/servers/registrar/ShutdownProcess.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/servers/registrar/ShutdownProcess.cpp b/src/servers/registrar/ShutdownProcess.cpp index 8c26e4ebad..df5a7e2a63 100644 --- a/src/servers/registrar/ShutdownProcess.cpp +++ b/src/servers/registrar/ShutdownProcess.cpp @@ -490,8 +490,6 @@ public: fCancelShutdownButton->Hide(); fRebootSystemButton->MakeDefault(true); fRebootSystemButton->Show(); - // TODO: Temporary work-around for a Haiku bug. - fRebootSystemButton->Invalidate(); SetTitle("System is Shut Down"); fTextView->SetText("It's now safe to turn off the computer."); @@ -1285,8 +1283,8 @@ ShutdownProcess::_WorkerDoShutdown() // we're through: do the shutdown _SetPhase(DONE_PHASE); - _SetShutdownWindowWaitForShutdown(); _ShutDown(); + _SetShutdownWindowWaitForShutdown(); PRINT((" _kern_shutdown() failed\n")); @@ -1307,7 +1305,7 @@ ShutdownProcess::_WorkerDoShutdown() _kern_shutdown(true); #endif } - + // either there's no GUI or reboot failed: we enter the kernel debugger // instead #ifdef __HAIKU__