--- a/Tools__CodeView2.st	Mon Jun 24 21:44:05 2013 +0200
+++ b/Tools__CodeView2.st	Mon Jun 24 21:48:21 2013 +0200
@@ -2146,7 +2146,7 @@
 !CodeView2::GutterView methodsFor:'help'!
 
 flyByHelpText
-    |bpntService|
+    |bpntService topView|
 
     bpntService := codeView services detect:[:service | service isBreakpointService] ifNone:nil.
     bpntService isNil ifTrue:[
@@ -2154,10 +2154,13 @@
     ].
 
     (bpntService canCreateOrToggleBreakpointAtLine:nil) ifFalse:[
-        bpntService hasBreakpoints ifFalse:[
-            ^ 'Sorry - cannot add breakpoint in the debugger (would need recompilation)\(can only add breakpoints if stopped at a method breakpoint)' withCRs
+        ((topView := codeView topView) class == DebugView) ifTrue:[
+            bpntService hasBreakpoints ifFalse:[
+                ^ 'Sorry - cannot add breakpoint in the debugger (would need recompilation)\(can only add breakpoints if stopped at a method breakpoint)' withCRs
+            ].
+            ^ 'Click to toggle existing breakpoint. Shift-Click to toggle tracepoint.\Sorry - cannot add new breakpoint if method is already entered\(i.e. if not stopped at a method breakpoint).' withCRs
         ].
-        ^ 'Click to toggle existing breakpoint. Shift-Click to toggle tracepoint.\Sorry - cannot add new breakpoint if method is already entered\(i.e. if not stopped at a method breakpoint).' withCRs
+        ^ 'Cannot add breakpoint when modified. Please accept first.'
     ].
 
     ^ 'Click to toggle breakpoint. Shift-Click to toggle tracepoint.'
@@ -3513,15 +3516,15 @@
 !CodeView2 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.87 2013-06-24 17:08:19 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.88 2013-06-24 19:48:21 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.87 2013-06-24 17:08:19 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__CodeView2.st,v 1.88 2013-06-24 19:48:21 cg Exp $'
 !
 
 version_SVN
-    ^ '$Id: Tools__CodeView2.st,v 1.87 2013-06-24 17:08:19 cg Exp $'
+    ^ '$Id: Tools__CodeView2.st,v 1.88 2013-06-24 19:48:21 cg Exp $'
 ! !