[BUG_FIXED] Fix wrong result returned by NPPM_GETLANGUAGENAME.

- Notepad-plus svn trunk @ 777
npp-community · Jun 18, 2011 · 2286eef · 2286eef
1 parent e15fed5
commit 2286eef
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp
@@ -1542,13 +1542,13 @@ void Notepad_plus::checkLangsMenu(int id) const
 	::CheckMenuRadioItem(_mainMenuHandle, IDM_LANG_C, IDM_LANG_USER_LIMIT, id, MF_BYCOMMAND);
 }
 
-generic_string Notepad_plus::getLangDesc(LangType langType, bool shortDesc)
+generic_string Notepad_plus::getLangDesc(LangType langType, bool getName)
 {
 
 	if ((langType >= L_EXTERNAL) && (langType < NppParameters::getInstance()->L_END))
 	{
 		ExternalLangContainer & elc = NppParameters::getInstance()->getELCFromIndex(langType - L_EXTERNAL);
-		if (shortDesc)
+		if (getName)
 			return generic_string(elc._name);
 		else
 			return generic_string(elc._desc);
@@ -1557,7 +1557,11 @@ generic_string Notepad_plus::getLangDesc(LangType langType, bool shortDesc)
 	if (langType > L_EXTERNAL)
         langType = L_TEXT;
 
-	generic_string str2Show = ScintillaEditView::langNames[langType].longName;
+	generic_string str2Show;
+	if (getName)
+		str2Show = ScintillaEditView::langNames[langType].shortName;
+	else
+		str2Show = ScintillaEditView::langNames[langType].longName;
 
 	if (langType == L_USER)
 	{

diff --git a/PowerEditor/src/Notepad_plus.h b/PowerEditor/src/Notepad_plus.h
@@ -470,7 +470,7 @@ friend class Notepad_plus_Window;
 	void enableConvertMenuItems(formatType f) const;
 	void checkUnicodeMenuItems() const;
 
-	generic_string getLangDesc(LangType langType, bool shortDesc = false);
+	generic_string getLangDesc(LangType langType, bool getName = false);
 
 	void setLangStatus(LangType langType){
 		_statusBar.setText(getLangDesc(langType).c_str(), STATUSBAR_DOC_TYPE);

diff --git a/PowerEditor/src/NppBigSwitch.cpp b/PowerEditor/src/NppBigSwitch.cpp
@@ -1772,15 +1772,15 @@ LRESULT Notepad_plus::process(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa
 
 		case NPPM_GETLANGUAGENAME:
 		{
-			generic_string langName = getLangDesc((LangType)wParam, false);
+			generic_string langName = getLangDesc((LangType)wParam, true);
 			if (lParam)
 				lstrcpy((LPTSTR)lParam, langName.c_str());
 			return langName.length();
 		}
 
 		case NPPM_GETLANGUAGEDESC:
 		{
-			generic_string langDesc = getLangDesc((LangType)wParam, true);
+			generic_string langDesc = getLangDesc((LangType)wParam, false);
 			if (lParam)
 				lstrcpy((LPTSTR)lParam, langDesc.c_str());
 			return langDesc.length();

diff --git a/PowerEditor/src/NppIO.cpp b/PowerEditor/src/NppIO.cpp
@@ -434,7 +434,7 @@ int Notepad_plus::setFileOpenSaveDlgFilters(FileDialog & fDlg, int langType)
 			const TCHAR *filters = stringFilters.c_str();
 			if (filters[0])
 			{
-				fDlg.setExtsFilter(getLangDesc(lid, true).c_str(), filters);
+				fDlg.setExtsFilter(getLangDesc(lid, false).c_str(), filters);
 
                 //
                 // Get index of lang type to find