| Révision | 29380 (tree) |
|---|---|
| l'heure | 2022-04-09 01:48:04 |
| Auteur | stefankueng |
branches/1.14.x/src/Changelog.txt (diff)
branches/1.14.x/src/TortoiseProc/LogDialog/LogDlg.cpp (diff) branches/1.14.x/src/Utils/MiscUI/FilterEdit.cpp (diff)
branches/1.14.x/src branches/1.14.x| @@ -1,4 +1,10 @@ | ||
| 1 | -Version 1.14.2 | |
| 1 | +Version 1.14.3 | |
| 2 | +- BUG: clipboard wasn't closed after pasting into | |
| 3 | + the filter control in the log dialog. (Stefan) | |
| 4 | +- BUG: when merging via log dialog, a warning was falsely | |
| 5 | + shown "The target has local modifications". (Stefan) | |
| 6 | + | |
| 7 | +Version 1.14.2 | |
| 2 | 8 | - BUG: when starting a log dialog from an existing |
| 3 | 9 | log dialog, the project properties were |
| 4 | 10 | not read anymore. (Stefan) |
| @@ -5804,9 +5804,9 @@ | ||
| 5804 | 5804 | bool bModified = false; |
| 5805 | 5805 | bool bSparse = false; |
| 5806 | 5806 | |
| 5807 | - if (GetWCRevisionStatus(CTSVNPath(path), true, minRev = 0, maxRev, bSwitched, bModified = false, bSparse)) | |
| 5807 | + if (GetWCRevisionStatus(CTSVNPath(path), true, minRev, maxRev, bSwitched, bModified, bSparse)) | |
| 5808 | 5808 | { |
| 5809 | - if (bModified == false) | |
| 5809 | + if (bModified) | |
| 5810 | 5810 | { |
| 5811 | 5811 | CString sTask1; |
| 5812 | 5812 | sTask1.Format(IDS_MERGE_WCDIRTYASK_TASK1, static_cast<LPCWSTR>(path)); |
| @@ -20,6 +20,7 @@ | ||
| 20 | 20 | #include "FilterEdit.h" |
| 21 | 21 | #include "LoadIconEx.h" |
| 22 | 22 | #include "Theme.h" |
| 23 | +#include "ClipboardHelper.h" | |
| 23 | 24 | |
| 24 | 25 | const UINT CFilterEdit::WM_FILTEREDIT_INFOCLICKED = ::RegisterWindowMessage(L"TSVNWM_FILTEREDIT_INFOCLICKED"); |
| 25 | 26 | const UINT CFilterEdit::WM_FILTEREDIT_CANCELCLICKED = ::RegisterWindowMessage(L"TSVNWM_FILTEREDIT_CANCELCLICKED"); |
| @@ -456,7 +457,8 @@ | ||
| 456 | 457 | |
| 457 | 458 | LRESULT CFilterEdit::OnPaste(WPARAM, LPARAM) |
| 458 | 459 | { |
| 459 | - if (OpenClipboard()) | |
| 460 | + CClipboardHelper clipBoard; | |
| 461 | + if (clipBoard.Open(m_hWnd)) | |
| 460 | 462 | { |
| 461 | 463 | CString toInsert; |
| 462 | 464 | HGLOBAL hglb = GetClipboardData(CF_TEXT); |
TortoiseSVN