[haiku-commits] r42217 - haiku/trunk/src/apps/debugger/user_interface/gui/team_window

  • From: anevilyak@xxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Fri, 17 Jun 2011 00:53:56 +0200 (CEST)

Author: anevilyak
Date: 2011-06-17 00:53:55 +0200 (Fri, 17 Jun 2011)
New Revision: 42217
Changeset: https://dev.haiku-os.org/changeset/42217
Ticket: https://dev.haiku-os.org/ticket/7704

Modified:
   haiku/trunk/src/apps/debugger/user_interface/gui/team_window/SourceView.cpp
Log:
Check that a source file is in fact available before attempting to use it to
generate a clipping name. Fixes #7704.



Modified: 
haiku/trunk/src/apps/debugger/user_interface/gui/team_window/SourceView.cpp
===================================================================
--- haiku/trunk/src/apps/debugger/user_interface/gui/team_window/SourceView.cpp 
2011-06-16 22:45:40 UTC (rev 42216)
+++ haiku/trunk/src/apps/debugger/user_interface/gui/team_window/SourceView.cpp 
2011-06-16 22:53:55 UTC (rev 42217)
@@ -32,6 +32,7 @@
 #include "FileSourceCode.h"
 #include "LocatableFile.h"
 #include "MessageCodes.h"
+#include "SourceLanguage.h"
 #include "StackTrace.h"
 #include "Statement.h"
 #include "Team.h"
@@ -1232,7 +1233,13 @@
                        BMessage message;
                        message.AddData ("text/plain", B_MIME_TYPE, 
text.String(),
                                text.Length());
-                       BString clipName = fSourceCode->GetSourceFile()->Name();
+                       BString clipName;
+                       if (fSourceCode->GetSourceFile() != NULL)
+                               clipName = fSourceCode->GetSourceFile()->Name();
+                       else if (fSourceCode->GetSourceLanguage() != NULL)
+                               clipName = 
fSourceCode->GetSourceLanguage()->Name();
+                       else
+                               clipName = "Text";
                        clipName << " clipping";
                        message.AddString ("be:clip_name", clipName.String());
                        message.AddInt32 ("be:actions", B_COPY_TARGET);


Other related posts:

  • » [haiku-commits] r42217 - haiku/trunk/src/apps/debugger/user_interface/gui/team_window - anevilyak