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

Debug Server: kill team when debug alert is escaped

Browse Source 
B_CLOSE_ON_ESCAPE makes alert->Go return -1. Handle this correctly and
kill the team.

Fixes #9983.
This commit is contained in:
Adrien Destugues
2014-11-20 11:02:06 +01:00
parent 9b8e5185da
commit afd7ded01e
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/debug/DebugServer.cpp
+5 -4
View File
@@ -818,17 +818,18 @@ TeamDebugHandler::_HandleMessage(DebugMessage *message)
BAlert *alert = new BAlert(NULL, buffer.String(), BAlert *alert = new BAlert(NULL, buffer.String(),
B_TRANSLATE("Terminate"), B_TRANSLATE("Debug"), B_TRANSLATE("Terminate"), B_TRANSLATE("Debug"),
B_TRANSLATE("Save report"), B_WIDTH_AS_USUAL, B_WARNING_ALERT); B_TRANSLATE("Save report"), B_WIDTH_AS_USUAL, B_WARNING_ALERT);
alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE);
debugAction = alert->Go();
_NotifyRegistrar(fTeam, false, debugAction != kActionKillTeam);
#else #else
BAlert *alert = new BAlert(NULL, buffer.String(), BAlert *alert = new BAlert(NULL, buffer.String(),
B_TRANSLATE("Kill"), B_TRANSLATE("Debug"), NULL, B_TRANSLATE("Kill"), B_TRANSLATE("Debug"), NULL,
B_WIDTH_AS_USUAL, B_WARNING_ALERT); B_WIDTH_AS_USUAL, B_WARNING_ALERT);
#endif
alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE); alert->SetFlags(alert->Flags() | B_CLOSE_ON_ESCAPE);
debugAction = alert->Go(); debugAction = alert->Go();
if (debugAction < 0) {
// Happens when closed by escape key
debugAction = kActionKillTeam;
}
_NotifyRegistrar(fTeam, false, debugAction != kActionKillTeam); _NotifyRegistrar(fTeam, false, debugAction != kActionKillTeam);
#endif
} }
return debugAction; return debugAction;