[BUG_FIXED] Fix a crash bug - crash on launch time if default User de…

…fined language was set on the previous session. - Notepad-plus svn trunk @ 823
npp-community · Oct 7, 2011 · 8768dfd · 8768dfd
1 parent ad22339
commit 8768dfd
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 33 deletions.
diff --git a/PowerEditor/src/NppIO.cpp b/PowerEditor/src/NppIO.cpp
@@ -973,7 +973,7 @@ bool Notepad_plus::loadSession(Session & session)
 			const TCHAR *pLn = session._mainViewFiles[i]._langName.c_str();
 			int id = getLangFromMenuName(pLn);
 			LangType typeToSet = L_TEXT;
-			if (id != 0 && lstrcmp(pLn, TEXT("User Defined")) != 0)
+			if (id != 0 && id != IDM_LANG_USER)
 				typeToSet = menuID2LangType(id);
 			if (typeToSet == L_EXTERNAL )
 				typeToSet = (LangType)(id - IDM_LANG_EXTERNAL + L_EXTERNAL);

diff --git a/PowerEditor/src/ScitillaComponent/UserDefineDialog.rc b/PowerEditor/src/ScitillaComponent/UserDefineDialog.rc
@@ -239,7 +239,7 @@ IDD_GLOBAL_USERDEFINE_DLG DIALOGEX 36, 44, 340, 550
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | WS_POPUP |
     WS_CAPTION | WS_VSCROLL | WS_SYSMENU
 EXSTYLE WS_EX_TOOLWINDOW
-CAPTION "User-Defined"
+CAPTION "User Defined Language"
 FONT 8, TEXT("MS Shell Dlg"), 0, 0, 0x0
 BEGIN
     LTEXT           "User language : ",IDC_LANGNAME_STATIC,0,3,63,8,0,WS_EX_RIGHT

diff --git a/PowerEditor/src/WinControls/ProjectPanel/demo.xml b/PowerEditor/src/WinControls/ProjectPanel/demo.xml