From 7e6a958b0b8a15e726a670da262dd07a8f94614d Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Fri, 7 Jun 2013 22:32:32 -0400 Subject: [PATCH] Fix regression introduced in 6b308faf. That commit switched to a single string column for representing breakpoint locations, but neglected to update the case of a breakpoint in a non-debug function to actually format the address as a string appropriately, leading to those simply showing no data since then. --- .../user_interface/gui/team_window/BreakpointListView.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/apps/debugger/user_interface/gui/team_window/BreakpointListView.cpp b/src/apps/debugger/user_interface/gui/team_window/BreakpointListView.cpp index 8c6ba03cc8..ba4b0312ca 100644 --- a/src/apps/debugger/user_interface/gui/team_window/BreakpointListView.cpp +++ b/src/apps/debugger/user_interface/gui/team_window/BreakpointListView.cpp @@ -263,18 +263,18 @@ private: case 2: { LocatableFile* sourceFile = location.SourceFile(); + BString data; if (sourceFile != NULL) { - BString data; data.SetToFormat("%s:%" B_PRId32, sourceFile->Name(), location.GetSourceLocation().Line() + 1); - value.SetTo(data); } else { AutoLocker teamLocker(fTeam); if (UserBreakpointInstance* instance = breakpoint->InstanceAt(0)) { - value.SetTo(instance->Address()); + data.SetToFormat("%#" B_PRIx64, instance->Address()); } } + value.SetTo(data); return true; } default: