tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-26 23:34:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix Reload Workspace not working

Browse Source 
In case of reloading, openWorkSpace() needs to be called forced=true always.

Fix #11551, close #15946
This commit is contained in:
notdodgeball 2024-12-12 17:32:57 -03:00 committed by Don Ho
parent 471a308bca
commit 06a03ea41e
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp
View File

@ -1073,7 +1073,6 @@ void ProjectPanel::popupMenuCmd(int cmdID)
case IDM_PROJECT_RELOADWS: case IDM_PROJECT_RELOADWS:
{ {
NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker(); NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker();
bool forceOpen = false;
if (_isDirty) if (_isDirty)
{ {
int res = pNativeSpeaker->messageBox("ProjectPanelReloadDirty", int res = pNativeSpeaker->messageBox("ProjectPanelReloadDirty",
@ -1082,11 +1081,7 @@ void ProjectPanel::popupMenuCmd(int cmdID)
L"Reload Workspace", L"Reload Workspace",
MB_YESNO | MB_ICONQUESTION | MB_APPLMODAL); MB_YESNO | MB_ICONQUESTION | MB_APPLMODAL);
if (res == IDYES) if (res == IDNO)
{
forceOpen = true;
}
else if (res == IDNO)
{ {
return; return;
} }
@ -1094,7 +1089,7 @@ void ProjectPanel::popupMenuCmd(int cmdID)
if (doesFileExist(_workSpaceFilePath.c_str())) if (doesFileExist(_workSpaceFilePath.c_str()))
{ {
openWorkSpace(_workSpaceFilePath.c_str(), forceOpen); openWorkSpace(_workSpaceFilePath.c_str(), true);
} }
else else
{ {