[PATCH] "Fetching tree conflict details" progress dialog may not show properly

22 views
Skip to first unread message

Evgeny Kotkov

unread,
Apr 26, 2018, 4:29:09 AM4/26/18
to TortoiseSVN-dev
Hi,

This patch fixes two issues that may prevent the "fetching tree conflict
details" progress dialog from displaying properly.

The first part of the issue is that initializing a CProgressDlg within the
CSVNProgressDlg::ResolvePostOperationConflicts() method requires COM
to be initialized, whereas its calling site currently doesn't do that.

The second part of the issue is that within the same method, the ShowModal()
method is called with the result of GetExplorerHWND() passed as the parent
window handle.  This affects the modality of the progress dialog, and this
part of the issue can be fixed by passing m_hWnd as the parent window
handle.


Thanks,
Evgeny Kotkov
tree-conflict-progress-fixup-v1.patch.txt

Stefan

unread,
Apr 26, 2018, 1:38:18 PM4/26/18
to TortoiseSVN-dev
thanks for the patch!
Committed in r28207

Stefan
Reply all
Reply to author
Forward
0 new messages