[BUG_FIXED] Fix Project Manager's "Open Workspace" and "Reload Workspace" commands bug - without removing the old Workspace.

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@832 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2011-10-29 00:03:02 +00:00
parent 077bcf56d1
commit 46888bb4f3

View File

@ -293,6 +293,7 @@ bool ProjectPanel::openWorkSpace(const TCHAR *projectFileName)
if (!::PathFileExists(projectFileName)) if (!::PathFileExists(projectFileName))
return false; return false;
_treeView.removeAllItems();
_workSpaceFilePath = projectFileName; _workSpaceFilePath = projectFileName;
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance())->getNativeLangSpeaker(); NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance())->getNativeLangSpeaker();
@ -316,8 +317,8 @@ void ProjectPanel::newWorkSpace()
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance())->getNativeLangSpeaker(); NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance())->getNativeLangSpeaker();
generic_string workspace = pNativeSpeaker->getProjectPanelLangStr("WorkspaceRootName", PM_WORKSPACEROOTNAME); generic_string workspace = pNativeSpeaker->getProjectPanelLangStr("WorkspaceRootName", PM_WORKSPACEROOTNAME);
_treeView.addItem(workspace.c_str(), TVI_ROOT, INDEX_CLEAN_ROOT); _treeView.addItem(workspace.c_str(), TVI_ROOT, INDEX_CLEAN_ROOT);
setWorkSpaceDirty(false); setWorkSpaceDirty(false);
_workSpaceFilePath = TEXT(""); _workSpaceFilePath = TEXT("");
} }
bool ProjectPanel::saveWorkSpace() bool ProjectPanel::saveWorkSpace()