Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[MODIF] Installer: Don't override contextMenu.xml.

Browse Source 
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@869 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2012-02-25 00:41:10 +00:00
parent 17f472c9c3
commit 41a9d6854b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PowerEditor/installer/nppSetup.nsi
View File

@ -414,11 +414,11 @@ Section -"Notepad++" mainSection
; This line is added due to the bug of xmlUpdater, to be removed in the future ; 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"' nsExec::ExecToStack '"$TEMP\xmlUpdater.exe" "$TEMP\stylesLexerModel.xml" "$TEMP\stylers.model.xml" "$UPDATE_PATH\stylers.xml"'
Delete "$UPDATE_PATH\contextMenu.backup.xml" SetOverwrite off
Rename "$UPDATE_PATH\contextMenu.xml" "$INSTDIR\contextMenu.backup.xml"
SetOutPath "$UPDATE_PATH\" SetOutPath "$UPDATE_PATH\"
File "..\bin\contextMenu.xml" File "..\bin\contextMenu.xml"
SetOverwrite on
SetOutPath "$INSTDIR\" SetOutPath "$INSTDIR\"
File "..\bin\langs.model.xml" File "..\bin\langs.model.xml"
File "..\bin\config.model.xml" File "..\bin\config.model.xml"

2
PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp
View File

@ -201,7 +201,7 @@ int PluginsManager::loadPlugin(const TCHAR *pluginFilePath, vector<generic_strin
delete pi; delete pi;
return -1; return -1;
} catch(...) { } catch(...) {
generic_string msg = TEXT("Fail loaded"); generic_string msg = TEXT("Failed to load");
msg += TEXT("\n\n"); msg += TEXT("\n\n");
msg += USERMSG; msg += USERMSG;
if (::MessageBox(NULL, msg.c_str(), pluginFilePath, MB_YESNO) == IDYES) if (::MessageBox(NULL, msg.c_str(), pluginFilePath, MB_YESNO) == IDYES)