From 910b3eb0c339ee27d869e8290f5fcfa05b1323b3 Mon Sep 17 00:00:00 2001
From: Sup Yut Sum <ch3cooli@gmail.com>
Date: Fri, 15 Aug 2014 21:47:21 +0800
Subject: [PATCH] Merge: Load ChooseVersion comboboxes after initializing other
 stuff

This may reduce crash.

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
---
 src/TortoiseProc/MergeDlg.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/TortoiseProc/MergeDlg.cpp b/src/TortoiseProc/MergeDlg.cpp
index a868bba99..4eed41e60 100644
--- a/src/TortoiseProc/MergeDlg.cpp
+++ b/src/TortoiseProc/MergeDlg.cpp
@@ -113,8 +113,6 @@ BOOL CMergeDlg::OnInitDialog()
 	GetWindowText(sWindowTitle);
 	CAppUtils::SetWindowTitle(m_hWnd, g_Git.m_CurrentDir, sWindowTitle);
 
-	InitChooseVersion(true);
-
 	m_ProjectProperties.ReadProps();
 
 	m_cLogMessage.Init(m_ProjectProperties);
@@ -148,6 +146,8 @@ BOOL CMergeDlg::OnInitDialog()
 	EnableSaveRestore(_T("MergeDlg"));
 	GetDlgItem(IDOK)->SetFocus();
 
+	InitChooseVersion(true);
+
 	return FALSE;
 }
 
-- 
2.11.4.GIT