May 25, 2018 updates: Privacy Policy
  • R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision28207 (tree)
Time2018-04-27 02:37:36
Authorstefankueng

Log Message

Patch from Evgeny Kotkov:
his 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.

Change Summary

Incremental Difference

--- trunk/src/TortoiseProc/SVNProgressDlg.cpp (revision 28206)
+++ trunk/src/TortoiseProc/SVNProgressDlg.cpp (revision 28207)
@@ -1282,6 +1282,9 @@
12821282
12831283 UINT CSVNProgressDlg::ProgressThread()
12841284 {
1285+ CoInitialize(NULL);
1286+ OnOutOfScope(CoUninitialize());
1287+
12851288 if (m_hidden)
12861289 SetWindowPos(NULL, 0, 0, 0, 0, SWP_HIDEWINDOW|
12871290 SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE|SWP_NOZORDER);
@@ -4363,7 +4366,7 @@
43634366 sProgressLine.LoadString(IDS_PROGRS_FETCHING_TREE_CONFLICT_INFO);
43644367 progressDlg.SetLine(1, sProgressLine);
43654368 progressDlg.SetShowProgressBar(false);
4366- progressDlg.ShowModal(GetExplorerHWND(), FALSE);
4369+ progressDlg.ShowModal(m_hWnd, FALSE);
43674370 conflict.SetProgressDlg(&progressDlg);
43684371 if (!conflict.FetchTreeDetails())
43694372 {
Show on old repository browser