From 3ab2cc86238d008491d45e4b79efb24876569b3f Mon Sep 17 00:00:00 2001 From: Sup Yut Sum Date: Sun, 19 Oct 2014 11:22:10 +0800 Subject: [PATCH] Minor refactoring Based on TortoiseSVN revision 25959 Signed-off-by: Sup Yut Sum --- src/TortoiseProc/AppUtils.cpp | 2 +- src/TortoiseProc/Settings/SetBugTraqAdv.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/TortoiseProc/AppUtils.cpp b/src/TortoiseProc/AppUtils.cpp index b5dc92e1c..0c11d870a 100644 --- a/src/TortoiseProc/AppUtils.cpp +++ b/src/TortoiseProc/AppUtils.cpp @@ -3249,7 +3249,7 @@ void CAppUtils::MarkWindowAsUnpinnable(HWND hWnd) PROPVARIANT var; var.vt = VT_BOOL; var.boolVal = VARIANT_TRUE; - hr = pps->SetValue(PKEY_AppUserModel_PreventPinning, var); + pps->SetValue(PKEY_AppUserModel_PreventPinning, var); pps->Release(); } } diff --git a/src/TortoiseProc/Settings/SetBugTraqAdv.cpp b/src/TortoiseProc/Settings/SetBugTraqAdv.cpp index 65c594b97..510cdf369 100644 --- a/src/TortoiseProc/Settings/SetBugTraqAdv.cpp +++ b/src/TortoiseProc/Settings/SetBugTraqAdv.cpp @@ -1,7 +1,7 @@ // TortoiseGit - a Windows shell extension for easy version control // Copyright (C) 2014 - TortoiseGit -// Copyright (C) 2008,2010 - TortoiseSVN +// Copyright (C) 2008,2010,2014 - TortoiseSVN // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -142,7 +142,8 @@ void CSetBugTraqAdv::OnOK() VARIANT_BOOL valid; ATL::CComBSTR parameters(m_sParameters); - if (FAILED(hr = pProvider->ValidateParameters(GetSafeHwnd(), parameters, &valid))) + hr = pProvider->ValidateParameters(GetSafeHwnd(), parameters, &valid); + if (FAILED(hr)) { ShowEditBalloon(IDC_BUGTRAQPARAMETERS, IDS_ERR_PROVIDER_VALIDATE_FAILED, IDS_ERR_ERROR, TTI_ERROR); return; -- 2.11.4.GIT