Add -show-dialog and -show-compare-as-menu command line options (4)

diff --git a/Src/Merge.cpp b/Src/Merge.cpp
index db9e179..af0bdf8 100644 (file)
--- a/Src/Merge.cpp
+++ b/Src/Merge.cpp
@@ -399,6 +399,11 @@ BOOL CMergeApp::InitInstance()
                ShowDialog(cmdInfo.m_nDialogType);
                return FALSE;
        }
+       if (cmdInfo.m_bShowCompareAsMenu)
+       {
+               if (!ShowCompareAsMenu(cmdInfo))
+                       return FALSE;
+       }
 
        // Register the application's document templates.  Document templates
        //  serve as the connection between documents, frame windows and views.
@@ -756,12 +761,6 @@ void CMergeApp::ShowDialog(MergeCmdLineInfo::DialogType type)
  */
 bool CMergeApp::ParseArgsAndDoOpen(MergeCmdLineInfo& cmdInfo, CMainFrame* pMainFrame)
 {
-       if (cmdInfo.m_bShowCompareAsMenu)
-       {
-               if (!ShowCompareAsMenu(cmdInfo))
-                       return false;
-       }
-
        bool bCompared = false;
        String strDesc[3];
        std::unique_ptr<PackingInfo> infoUnpacker;