i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Since the "restart"/"shutdown" alert has the inconvenient consequence that the

Browse Source 
shutdown process is entered (ie. you cannot start new applications anymore),
  I changed its window feel to normal to make it possible to let it appear on
  all workspaces.
* We should think about if simply letting it enter that phase later isn't the
  better solution, though. Opinions welcome.
* Automatic whitespace cleanup.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@27830 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2008-10-01 16:45:59 +00:00
parent fb2f3ef96c
commit 1b910a79a2
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/registrar/ShutdownProcess.cpp
+3 -3
View File
@@ -1248,10 +1248,8 @@ ShutdownProcess::_WorkerDoShutdown()
// that is, if an asynchronous BRoster::Shutdown() was requested, we // that is, if an asynchronous BRoster::Shutdown() was requested, we
// notify the caller at this point. // notify the caller at this point.
bool synchronous; bool synchronous;
if (fRequest->FindBool("synchronous", &synchronous) == B_OK if (fRequest->FindBool("synchronous", &synchronous) == B_OK && !synchronous)
&& !synchronous) {
_SendReply(B_OK); _SendReply(B_OK);
}
// ask the user to confirm the shutdown, if desired // ask the user to confirm the shutdown, if desired
bool askUser; bool askUser;
@@ -1264,6 +1262,8 @@ ShutdownProcess::_WorkerDoShutdown()
BAlert *alert = new BAlert(title, text, "Cancel", buttonText, NULL, BAlert *alert = new BAlert(title, text, "Cancel", buttonText, NULL,
B_WIDTH_AS_USUAL, B_WARNING_ALERT); B_WIDTH_AS_USUAL, B_WARNING_ALERT);
alert->SetShortcut(0, B_ESCAPE); alert->SetShortcut(0, B_ESCAPE);
alert->SetFeel(B_NORMAL_WINDOW_FEEL);
alert->SetWorkspaces(B_ALL_WORKSPACES);
int32 result = alert->Go(); int32 result = alert->Go();
if (result != 1) if (result != 1)