Could not open the 17th or later MRU project file. close #50

diff --git a/Src/Merge.cpp b/Src/Merge.cpp
index d53e5e5..cff389f 100644 (file)
--- a/Src/Merge.cpp
+++ b/Src/Merge.cpp
@@ -157,7 +157,8 @@ BEGIN_MESSAGE_MAP(CMergeApp, CWinApp)
        //{{AFX_MSG_MAP(CMergeApp)
        ON_COMMAND(ID_APP_ABOUT, OnAppAbout)
        ON_COMMAND(ID_HELP, OnHelp)
-       ON_COMMAND_EX_RANGE(ID_FILE_MRU_FILE1, ID_FILE_MRU_FILE16, OnOpenRecentFile)
+       ON_COMMAND_EX_RANGE(ID_FILE_PROJECT_MRU_FIRST, ID_FILE_PROJECT_MRU_LAST, OnOpenRecentFile)
+       ON_UPDATE_COMMAND_UI(ID_FILE_PROJECT_MRU_FIRST, &CWinApp::OnUpdateRecentFileMenu)
        ON_COMMAND(ID_FILE_MERGINGMODE, OnMergingMode)
        ON_UPDATE_COMMAND_UI(ID_FILE_MERGINGMODE, OnUpdateMergingMode)
        ON_UPDATE_COMMAND_UI(ID_STATUS_MERGINGMODE, OnUpdateMergingStatus)
@@ -1335,7 +1336,7 @@ void CMergeApp::SetupTempPath()
  */
 BOOL CMergeApp::OnOpenRecentFile(UINT nID)
 {
-       return LoadAndOpenProjectFile((const TCHAR *)m_pRecentFileList->m_arrNames[nID-ID_FILE_MRU_FILE1]);
+       return LoadAndOpenProjectFile(static_cast<const TCHAR *>(m_pRecentFileList->m_arrNames[nID-ID_FILE_PROJECT_MRU_FIRST]));
 }
 
 /**

diff --git a/Src/Merge.rc b/Src/Merge.rc
index 889d1a9..8bd5f64 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -153,7 +153,7 @@ BEGIN
         MENUITEM "Open Pro&ject...\tCtrl+J",    ID_FILE_OPENPROJECT\r
         MENUITEM "Sa&ve Project...",            ID_FILE_SAVEPROJECT\r
         MENUITEM SEPARATOR\r
-        MENUITEM "Recent Projects",             ID_FILE_MRU_FILE1\r
+        MENUITEM "Recent Projects",             ID_FILE_PROJECT_MRU_FIRST\r
         POPUP "Recent F&iles Or Folders"\r
         BEGIN\r
             MENUITEM "< Empty >",                   ID_NO_MRU\r

diff --git a/Src/resource.h b/Src/resource.h
index edf4754..e73a631 100644 (file)
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -1216,6 +1216,8 @@
 #define IDS_CLOSE_RIGHT_TABS            33542\r
 #define IDS_CLOSE_OTHER_TABS            33543\r
 #define IDS_TABBAR_AUTO_MAXWIDTH        33544\r
+#define ID_FILE_PROJECT_MRU_FIRST       33545\r
+#define ID_FILE_PROJECT_MRU_LAST        33644\r
 \r
 // Next default values for new objects\r
 // \r