Skip to content
Browse files

Better handling of language plugin mismatch case.

  • Loading branch information...
1 parent c96688b commit bc83d715810e91040dc6d487f6d80e0b84901519 @alexd committed Nov 23, 2010
Showing with 4 additions and 4 deletions.
  1. +2 −2 metapad.c
  2. +2 −2 metapad.rc
View
4 metapad.c
@@ -30,8 +30,10 @@
#undef UNICODE
#endif
+/* Experiental/not working yet */
//#define STREAMING
//#define USE_BOOKMARKS
+//#define BUILD_METAPAD_UNICODE
#include <windows.h>
#include <shellapi.h>
@@ -390,8 +392,6 @@ HINSTANCE LoadAndVerifyLanguagePlugin(LPCTSTR szPlugin)
TCHAR szVersionError[550];
wsprintf(szVersionError, GetString(IDS_PLUGIN_MISMATCH_ERROR), szVersionPlug, szVersionThis);
ERROROUT(szVersionError);
- FreeLibrary(hinstTemp);
- return NULL;
}
}
View
4 metapad.rc
@@ -936,7 +936,7 @@ END
STRINGTABLE DISCARDABLE
BEGIN
- IDS_VERSION_SYNCH "3.5"
+ IDS_VERSION_SYNCH "3.6"
IDS_PLUGIN_LANGUAGE "English (Plugin Template)"
IDS_PLUGIN_RELEASE "1"
IDS_PLUGIN_TRANSLATOR "Alex Davidson"
@@ -1068,7 +1068,7 @@ BEGIN
IDS_BAD_STRING_PLUGIN_ERROR
"Error fetching version string resource from plugin DLL. It is probably not a valid metapad language plugin."
IDS_PLUGIN_MISMATCH_ERROR
- "This language plugin is for metapad version %s, but you are running metapad version %s. Check the metapad website for language plugin updates."
+ "Your language plugin is for metapad %s, but you are running metapad %s.\n\nSome menu or dialog features may be missing or not work correctly.\n\nRun metapad /v to skip this message."
IDS_ALLRIGHTS "All Rights Reserved"
IDS_OK_BUTTON "OK"
IDS_DEFAULT_FILTER_TEXT "Text (*.*)|*.*"

0 comments on commit bc83d71

Please sign in to comment.
Something went wrong with that request. Please try again.