diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi index c7e0fe268..32ac07632 100644 --- a/PowerEditor/installer/nppSetup.nsi +++ b/PowerEditor/installer/nppSetup.nsi @@ -414,11 +414,11 @@ Section -"Notepad++" mainSection ; This line is added due to the bug of xmlUpdater, to be removed in the future nsExec::ExecToStack '"$TEMP\xmlUpdater.exe" "$TEMP\stylesLexerModel.xml" "$TEMP\stylers.model.xml" "$UPDATE_PATH\stylers.xml"' - Delete "$UPDATE_PATH\contextMenu.backup.xml" - Rename "$UPDATE_PATH\contextMenu.xml" "$INSTDIR\contextMenu.backup.xml" + SetOverwrite off SetOutPath "$UPDATE_PATH\" File "..\bin\contextMenu.xml" + SetOverwrite on SetOutPath "$INSTDIR\" File "..\bin\langs.model.xml" File "..\bin\config.model.xml" diff --git a/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp b/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp index f74e7cbe4..718432eb8 100644 --- a/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp +++ b/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp @@ -201,7 +201,7 @@ int PluginsManager::loadPlugin(const TCHAR *pluginFilePath, vector