From c8a9444b630a5a7b3d9d9b748e1921dcc542444f Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 7 Feb 2006 23:59:55 +0000 Subject: [PATCH] After cancelling the shutdown process applications couldn't be started anymore. Fixes bug #119. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16291 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/registrar/ShutdownProcess.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/servers/registrar/ShutdownProcess.cpp b/src/servers/registrar/ShutdownProcess.cpp index df5a7e2a63..6c120b6d7c 100644 --- a/src/servers/registrar/ShutdownProcess.cpp +++ b/src/servers/registrar/ShutdownProcess.cpp @@ -635,6 +635,11 @@ ShutdownProcess::~ShutdownProcess() // remove the application quit watcher fRoster->RemoveWatcher(this); + // If an error occurred (e.g. the shutdown process was cancelled), the + // roster should accept applications again. + if (fShutdownError != B_OK) + fRoster->SetShuttingDown(false); + // delete the internal event semaphore if (fInternalEventSemaphore >= 0) delete_sem(fInternalEventSemaphore);