From 7c5f5de3bc7c905d10e37ced7982678b4f41c685 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Wed, 28 Jun 2017 20:21:46 +0200 Subject: [PATCH] Fixed issue #3013: Error message if remote Git output contains non-ASCII chars Signed-off-by: Sven Strickroth --- src/Changelog.txt | 1 + src/TortoiseProc/ProgressDlg.cpp | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index 37265eb66..fe0ad1c1e 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -45,6 +45,7 @@ Released: unreleased * Fixed issue #3002: Push underlined hotkey is missing in log window. * Fixed issue #3005: TortoiseGit does not support cloning local svn repositories * Fixed issue #3011: clone: --bare and --origin options are incompatible + * Fixed issue #3013: Error message if remote Git output contains non-ASCII chars = Release 2.4.0 = Released: 2017-01-31 diff --git a/src/TortoiseProc/ProgressDlg.cpp b/src/TortoiseProc/ProgressDlg.cpp index 8f6aff540..0741449dc 100644 --- a/src/TortoiseProc/ProgressDlg.cpp +++ b/src/TortoiseProc/ProgressDlg.cpp @@ -1,6 +1,6 @@ // TortoiseGit - a Windows shell extension for easy version control -// Copyright (C) 2008-2016 - TortoiseGit +// Copyright (C) 2008-2017 - TortoiseGit // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -611,8 +611,8 @@ void CProgressDlg::ParserCmdOutput(CRichEditCtrl &log,CProgressCtrl &progressctr } log.PostMessage(WM_VSCROLL, SB_BOTTOM, 0); - int s1 = oneline.ReverseFind(L':'); - int s2 = oneline.Find(L'%'); + int s1 = str.ReverseFind(L':'); + int s2 = str.Find(L'%'); if (s1 > 0 && s2 > 0) { if(CurrentWork) -- 2.11.4.GIT