fix #72

- keep menus also in case scripts are located just at a deeper nesting level - avoid compiler warning about type conversion
bruderstein · Dec 23, 2023 · b081788 · b081788
1 parent 50fd498
commit b081788
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/PythonScript/src/MenuManager.cpp b/PythonScript/src/MenuManager.cpp
@@ -415,6 +415,7 @@ bool MenuManager::findScripts(HMENU hBaseMenu, size_t basePathLength, tstring& p
 	HANDLE hFound = FindFirstFile(searchPath.c_str(), &findData);
 	BOOL found = (hFound != INVALID_HANDLE_VALUE) ? TRUE : FALSE;
 	idx_t position = 0;
+	bool subDirScriptsFoundAllDirs = false;
 
 	while (found)
 	{
@@ -439,6 +440,8 @@ bool MenuManager::findScripts(HMENU hBaseMenu, size_t basePathLength, tstring& p
 			}
 
 			bool subDirScriptsFound = findScripts(hSubmenu, basePathLength, searchPath);
+			subDirScriptsFoundAllDirs |= subDirScriptsFound;
+
 			if (subDirScriptsFound )
 			{
 				// startID = nextID;
@@ -468,6 +471,12 @@ bool MenuManager::findScripts(HMENU hBaseMenu, size_t basePathLength, tstring& p
 
 	bool scriptsFound = (TRUE == found);
 
+	if(subDirScriptsFoundAllDirs)
+	{
+		//keep menu also in case scripts are found in a deeper nested submenu
+		scriptsFound = true;
+	}
+
 	while(found)
 	{
 		tstring fullFilename(path);
@@ -720,7 +729,7 @@ void MenuManager::reconfigure()
 		if (position < m_originalDynamicCount)
 		{
 			ShortcutKey sk;
-			BOOL hasKey = ::SendMessage(m_hNotepad, NPPM_GETSHORTCUTBYCMDID, static_cast<WPARAM>(m_funcItems[m_dynamicStartIndex + position - 1]._cmdID), reinterpret_cast<LPARAM>(&sk));
+			BOOL hasKey = static_cast<BOOL>(::SendMessage(m_hNotepad, NPPM_GETSHORTCUTBYCMDID, static_cast<WPARAM>(m_funcItems[m_dynamicStartIndex + position - 1]._cmdID), reinterpret_cast<LPARAM>(&sk)));
 
 			tstring menuTitle(filename);