From 06a03ea41ed6fe728cb9dea764469e3e4c2b0081 Mon Sep 17 00:00:00 2001 From: notdodgeball Date: Thu, 12 Dec 2024 17:32:57 -0300 Subject: [PATCH] Fix Reload Workspace not working In case of reloading, openWorkSpace() needs to be called forced=true always. Fix #11551, close #15946 --- .../src/WinControls/ProjectPanel/ProjectPanel.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp b/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp index b0d98f236..f6a8e7871 100644 --- a/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp +++ b/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp @@ -1073,7 +1073,6 @@ void ProjectPanel::popupMenuCmd(int cmdID) case IDM_PROJECT_RELOADWS: { NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker(); - bool forceOpen = false; if (_isDirty) { int res = pNativeSpeaker->messageBox("ProjectPanelReloadDirty", @@ -1082,11 +1081,7 @@ void ProjectPanel::popupMenuCmd(int cmdID) L"Reload Workspace", MB_YESNO | MB_ICONQUESTION | MB_APPLMODAL); - if (res == IDYES) - { - forceOpen = true; - } - else if (res == IDNO) + if (res == IDNO) { return; } @@ -1094,7 +1089,7 @@ void ProjectPanel::popupMenuCmd(int cmdID) if (doesFileExist(_workSpaceFilePath.c_str())) { - openWorkSpace(_workSpaceFilePath.c_str(), forceOpen); + openWorkSpace(_workSpaceFilePath.c_str(), true); } else {