Defer Comparer command-line open until startup settles

Author: chammoru

.github/workflows/store-validation-trial.yml

@@ -149,6 +149,10 @@ jobs:
               }
               [Q1WindowTools]::ShowWindowAsync($process.MainWindowHandle, 3) | Out-Null
               Start-Sleep -Seconds 3
+              $process.Refresh()
+              if ($process.HasExited) {
+                throw "$exeName exited after opening its command-line source input."
+              }
 
               $bounds = [System.Windows.Forms.Screen]::PrimaryScreen.Bounds
               "$exeName primary screen: $($bounds.Width)x$($bounds.Height)" |

Comparer/MainFrm.cpp

@@ -51,6 +51,7 @@ BEGIN_MESSAGE_MAP(CMainFrame, CFrameWnd)
 	ON_WM_TIMER()
 	ON_WM_DESTROY()
 	ON_WM_CREATE()
+	ON_MESSAGE(WM_OPEN_PENDING_FILE, &CMainFrame::OnOpenPendingFile)
 END_MESSAGE_MAP()
 
 CMainFrame::CMainFrame()
@@ -646,8 +647,21 @@ void CMainFrame::ActivateFrame(int nCmdShow)
 	CFrameWnd::ActivateFrame(nCmdShow);
 
 	CComparerDoc *pDoc = static_cast<CComparerDoc *>(GetActiveDocument());
-	if (pDoc->mPendingFile != "") {
-		pDoc->OnOpenDocument(pDoc->mPendingFile);
-		pDoc->mPendingFile = "";
-	}
+	if (pDoc != NULL && !pDoc->mPendingFile.IsEmpty())
+		PostMessage(WM_OPEN_PENDING_FILE);
+}
+
+LRESULT CMainFrame::OnOpenPendingFile(WPARAM, LPARAM)
+{
+	CComparerDoc *pDoc = static_cast<CComparerDoc *>(GetActiveDocument());
+	if (pDoc == NULL || pDoc->mPendingFile.IsEmpty())
+		return 0;
+
+	// Wait until startup activation and layout messages have completed before a
+	// multi-source open starts metric calculation and the scan worker.
+	CString pendingFile = pDoc->mPendingFile;
+	pDoc->mPendingFile.Empty();
+	pDoc->OnOpenDocument(pendingFile);
+
+	return 0;
 }

Comparer/MainFrm.h

@@ -13,6 +13,8 @@
 #define FRAMES_INFO_H         84
 #define POS_INFO_W            76
 
+#define WM_OPEN_PENDING_FILE  (WM_APP + 1)
+
 #define COMPARER_DEF_W        (CANVAS_DEF_W + /* left */ \
                               (CANVAS_DEF_W + QSPLITTER_W) + /* right */ \
                               (POS_INFO_W + QSPLITTER_W)) /* position */
@@ -98,6 +100,7 @@ class CMainFrame : public CFrameWnd
 	afx_msg void OnFpsChange(UINT nID);
 	afx_msg void OnViewsChange(UINT nID);
 	afx_msg void OnOptionsChange(UINT nID);
+	afx_msg LRESULT OnOpenPendingFile(WPARAM wParam, LPARAM lParam);
 	virtual void ActivateFrame(int nCmdShow = -1);
 };