← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/monodevelop/oneiric

« back to all changes in this revision

Viewing changes to src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Initializer.cs

  • Committer: Bazaar Package Importer
  • Author(s): Jo Shields
  • Date: 2011-06-27 17:03:13 UTC
  • mto: (1.8.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 54.
  • Revision ID: james.westby@ubuntu.com-20110627170313-6cvz3s19x6e9hqe9
Import upstream version 2.5.92+dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/Initializer.cs
75
75
                        if (frame == null)
76
76
                                return;
77
77
                        
78
 
                        FilePath file = frame.SourceLocation.Filename;
 
78
                        FilePath file = frame.SourceLocation.FileName;
79
79
                        int line = frame.SourceLocation.Line;
80
80
                        
81
81
                        if (!file.IsNullOrEmpty && System.IO.File.Exists (file) && line != -1) {
82
 
                                Document doc = IdeApp.Workbench.OpenDocument (file, line, 1, !disassemblyCurrent, null, false);
 
82
                                OpenDocumentOptions ops = !disassemblyCurrent ? OpenDocumentOptions.BringToFront : OpenDocumentOptions.None;
 
83
                                Document doc = IdeApp.Workbench.OpenDocument (file, line, 1, ops);
83
84
                                if (doc != null)
84
85
                                        return;
85
86
                        }
113
114
                        if (bt != null) {
114
115
                                for (int n=0; n<bt.FrameCount; n++) {
115
116
                                        StackFrame sf = bt.GetFrame (n);
116
 
                                        if (!sf.IsExternalCode && !string.IsNullOrEmpty (sf.SourceLocation.Filename) && System.IO.File.Exists (sf.SourceLocation.Filename) && sf.SourceLocation.Line != -1) {
117
 
                                                if (n != DebuggingService.CurrentFrameIndex)
118
 
                                                        DebuggingService.CurrentFrameIndex = n;
119
 
                                                break;
 
117
                                        if (!sf.IsExternalCode && sf.SourceLocation.Line != -1) {
 
118
                                                bool found = !string.IsNullOrEmpty (sf.SourceLocation.FileName)
 
119
                                                        && System.IO.File.Exists (sf.SourceLocation.FileName);
 
120
                                                if (found) {
 
121
                                                        if (n != DebuggingService.CurrentFrameIndex)
 
122
                                                                DebuggingService.CurrentFrameIndex = n;
 
123
                                                        break;
 
124
                                                } else {
 
125
                                                        LoggingService.LogWarning ("Debugger could not find file '{0}'", sf.SourceLocation.FileName);
 
126
                                                }
120
127
                                        }
121
128
                                }
122
129
                        }