From 8274b9084910a082b364590ad11ec89d4cce191f Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Tue, 22 Jan 2013 14:12:23 +0100 Subject: [PATCH] GitProgressDlg: Decode UTF-8 encoded libgit2 error messages Signed-off-by: Sven Strickroth --- src/TortoiseProc/GitProgressDlg.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/TortoiseProc/GitProgressDlg.cpp b/src/TortoiseProc/GitProgressDlg.cpp index 624b78e8d..19f0fed27 100644 --- a/src/TortoiseProc/GitProgressDlg.cpp +++ b/src/TortoiseProc/GitProgressDlg.cpp @@ -1,6 +1,6 @@ // TortoiseGit - a Windows shell extension for easy version control -// Copyright (C) 2008-2012 - TortoiseGit +// Copyright (C) 2008-2013 - TortoiseGit // Copyright (C) 2003-2008 - TortoiseSVN // This program is free software; you can redistribute it and/or @@ -824,7 +824,11 @@ bool CGitProgressDlg::SetBackgroundImage(UINT nID) void CGitProgressDlg::ReportGitError() { - ReportError(CString(giterr_last()->message)); + const git_error *err = giterr_last(); + if (err == nullptr) + ReportError(_T("An error occoured in libgit2, but no message is available.")); + else + ReportError(CUnicodeUtils::GetUnicode(giterr_last()->message)); } void CGitProgressDlg::ReportError(const CString& sError) -- 2.11.4.GIT