From c29240d78acd29c5c575967ed6e56e428ad450cd Mon Sep 17 00:00:00 2001 From: jofon <70416966+jofon@users.noreply.github.com> Date: Wed, 24 Mar 2021 15:48:41 +0000 Subject: [PATCH] Fix "Reload Workspace" menu command not working issue Now forces the workspace to be opened when the user accepts that reloading will discard all modifications Fix #9350, close #9696 --- PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp b/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp index bfccd3bd5..4c52172af 100644 --- a/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp +++ b/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp @@ -1098,6 +1098,7 @@ void ProjectPanel::popupMenuCmd(int cmdID) case IDM_PROJECT_RELOADWS: { NativeLangSpeaker *pNativeSpeaker = (NppParameters::getInstance()).getNativeLangSpeaker(); + bool forceOpen = false; if (_isDirty) { int res = pNativeSpeaker->messageBox("ProjectPanelReloadDirty", @@ -1108,7 +1109,7 @@ void ProjectPanel::popupMenuCmd(int cmdID) if (res == IDYES) { - // Do nothing + forceOpen = true; } else if (res == IDNO) { @@ -1118,7 +1119,7 @@ void ProjectPanel::popupMenuCmd(int cmdID) if (::PathFileExists(_workSpaceFilePath.c_str())) { - openWorkSpace(_workSpaceFilePath.c_str()); + openWorkSpace(_workSpaceFilePath.c_str(), forceOpen); } else {