Skip to content

Commit 9b55889

Browse files
committed
Fix wrong context menu source file name
It should be contextMenu.model.xml instead of contextMenu.xml. Fix notepad-plus-plus@c806b12#r180032565
1 parent c806b12 commit 9b55889

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

PowerEditor/src/Parameters.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -639,6 +639,9 @@ static constexpr ScintillaKeyDefinition scintKeyDefs[]
639639
#define SHORTCUTSXML_FILENAME L"shortcuts.xml"
640640
#define SHORTCUTSXML_MODEL_FILENAME L"shortcuts.model.xml"
641641

642+
#define CONTEXTMENUXML_FILENAME L"contextMenu.xml"
643+
#define CONTEXTMENUXML_MODEL_FILENAME L"contextMenu.model.xml"
644+
642645
#define SESSION_BACKUP_EXT L".inCaseOfCorruption.bak"
643646

644647
using PGNSI = void (WINAPI*)(LPSYSTEM_INFO);
@@ -1692,12 +1695,12 @@ bool NppParameters::load()
16921695
// contextMenu.xml : for per-user //
16931696
//--------------------------------//
16941697
_contextMenuPath = _userPath;
1695-
pathAppend(_contextMenuPath, L"contextMenu.xml");
1698+
pathAppend(_contextMenuPath, CONTEXTMENUXML_FILENAME);
16961699

16971700
if (!doesFileExist(_contextMenuPath.c_str()))
16981701
{
16991702
std::wstring srcContextMenuPath(_nppPath);
1700-
pathAppend(srcContextMenuPath, L"contextMenu.xml");
1703+
pathAppend(srcContextMenuPath, CONTEXTMENUXML_MODEL_FILENAME);
17011704

17021705
if (doesFileExist(srcContextMenuPath.c_str()))
17031706
::CopyFile(srcContextMenuPath.c_str(), _contextMenuPath.c_str(), TRUE);

0 commit comments

Comments
 (0)