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

Fix regression introduced in 21d8063.

Browse Source 
We can't use BPath to get the filename for the source file path embedded
in the debug information, since it may be relative, which BPath will try to
normalize.
This commit is contained in:
Rene Gollent
2013-06-25 17:00:54 -04:00
parent 8a690c4914
commit 2214cb57ee
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/debugger/user_interface/gui/team_window/TeamWindow.cpp
+10 -8
View File
@@ -1459,18 +1459,20 @@ TeamWindow::_HandleResolveMissingSourceFile(entry_ref& locatedPath)
if (sourceFile != NULL) { if (sourceFile != NULL) {
BString sourcePath; BString sourcePath;
sourceFile->GetPath(sourcePath); sourceFile->GetPath(sourcePath);
BPath sourceFilePath(sourcePath); BString sourceFileName(sourcePath);
BPath targetFilePath(&locatedPath); int32 index = sourcePath.FindLast('/');
if (sourceFilePath.InitCheck() != B_OK if (index >= 0)
|| targetFilePath.InitCheck() != B_OK) { sourceFileName.Remove(0, index + 1);
return;
}
if (strcmp(sourceFilePath.Leaf(), targetFilePath.Leaf()) != 0) { BPath targetFilePath(&locatedPath);
if (targetFilePath.InitCheck() != B_OK)
return;
if (strcmp(sourceFileName.String(), targetFilePath.Leaf()) != 0) {
BString message; BString message;
message.SetToFormat("The names of source file '%s' and located" message.SetToFormat("The names of source file '%s' and located"
" file '%s' differ. Use file anyway?", " file '%s' differ. Use file anyway?",
sourceFilePath.Leaf(), targetFilePath.Leaf()); sourceFileName.String(), targetFilePath.Leaf());
BAlert* alert = new(std::nothrow) BAlert( BAlert* alert = new(std::nothrow) BAlert(
"Source path mismatch", message.String(), "Cancel", "Use"); "Source path mismatch", message.String(), "Cancel", "Use");
if (alert == NULL) if (alert == NULL)