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

debug_server: Fix #11659.

Browse Source 
- If we're asked to debug a team graphically, check if Debugger is already
  running. If so, send it a message asking it to debug the team rather than
  trying to invoke it by command line, as the latter will simply result in
  a B_SILENT_RELAUNCH message, and won't actually process the request properly.
This commit is contained in:
Rene Gollent 2014-12-26 23:15:05 -05:00
parent edf74e6ca8
commit cf629b09f9
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/servers/debug/DebugServer.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright 2011-2013, Rene Gollent, rene@gollent.com.
* Copyright 2011-2014, Rene Gollent, rene@gollent.com.
* Copyright 2005-2009, Ingo Weinhold, bonefish@users.sf.net.
* Distributed under the terms of the MIT License.
*/
@ -44,6 +44,10 @@ enum {
};
static const char* kDebuggerSignature = "application/x-vnd.Haiku-Debugger";
static const int32 MSG_DEBUG_THIS_TEAM = 'dbtt';
//#define HANDOVER_USE_GDB 1
#define HANDOVER_USE_DEBUGGER 1
@ -648,6 +652,20 @@ TeamDebugHandler::_EnterDebugger(bool saveReport)
"terminal (debugger) for team %" B_PRId32 "...\n", fTeam));
#elif defined(HANDOVER_USE_DEBUGGER)
if (!debugInConsoled && !saveReport
&& be_roster->IsRunning(kDebuggerSignature)) {
// for graphical handovers, check if Debugger is already running,
// and if it is, simply send it a message to attach to the requested
// team.
BMessenger messenger(kDebuggerSignature);
BMessage message(MSG_DEBUG_THIS_TEAM);
if (message.AddInt32("team", fTeam) == B_OK
&& messenger.SendMessage(&message) == B_OK) {
return 0;
}
}
// prepare the argument vector
BPath debuggerPath;
if (debugInConsoled) {