Browse Source

Fix saving/loading open files and breakpoints.

pull/32/merge
Daniel Grunwald 12 years ago
parent
commit
24f68bf609
  1. 7
      src/Main/Base/Project/Src/Project/Behaviors/DefaultProjectBehavior.cs
  2. 2
      src/Main/SharpDevelop/Editor/Bookmarks/BookmarkManager.cs

7
src/Main/Base/Project/Src/Project/Behaviors/DefaultProjectBehavior.cs

@ -81,15 +81,14 @@ namespace ICSharpCode.SharpDevelop.Project
SD.MainThread.VerifyAccess(); SD.MainThread.VerifyAccess();
// breakpoints and files // breakpoints and files
Properties properties = new Properties(); preferences.SetList("bookmarks", SD.BookmarkManager.GetProjectBookmarks(Project));
properties.SetList("bookmarks", SD.BookmarkManager.GetProjectBookmarks(Project));
List<string> files = new List<string>(); List<string> files = new List<string>();
foreach (var fileName in FileService.GetOpenFiles()) { foreach (var fileName in FileService.GetOpenFiles()) {
if (fileName != null && Project.IsFileInProject(fileName)) { if (fileName != null && Project.IsFileInProject(fileName)) {
files.Add(fileName); files.Add(fileName);
} }
} }
properties.SetList("openFiles", files); preferences.SetList("openFiles", files);
} }
public override void ProjectLoaded() public override void ProjectLoaded()
@ -101,7 +100,7 @@ namespace ICSharpCode.SharpDevelop.Project
SD.BookmarkManager.AddMark(mark); SD.BookmarkManager.AddMark(mark);
} }
List<string> filesToOpen = new List<string>(); List<string> filesToOpen = new List<string>();
foreach (string fileName in memento.GetList<string>("files")) { foreach (string fileName in memento.GetList<string>("openFiles")) {
if (File.Exists(fileName)) { if (File.Exists(fileName)) {
filesToOpen.Add(fileName); filesToOpen.Add(fileName);
} }

2
src/Main/SharpDevelop/Editor/Bookmarks/BookmarkManager.cs

@ -19,7 +19,7 @@ namespace ICSharpCode.SharpDevelop.Editor.Bookmarks
{ {
public BookmarkManager() public BookmarkManager()
{ {
Project.ProjectService.SolutionClosing += delegate { Clear(); }; Project.ProjectService.SolutionClosed += delegate { Clear(); };
} }
List<SDBookmark> bookmarks = new List<SDBookmark>(); List<SDBookmark> bookmarks = new List<SDBookmark>();

Loading…
Cancel
Save