From 50346dca8f3e5beca8114380abb847d0c7e5e7f1 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Wed, 21 Nov 2012 11:06:47 +0100 Subject: [PATCH] Fixed issue #1535: Unclear UI in prompt dialog of Stash Save Signed-off-by: Sven Strickroth --- src/Changelog.txt | 8 +++++++- src/TortoiseProc/StashSave.cpp | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index 1b4b414e7..ff23fa0f4 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -1,4 +1,10 @@ -= Release 1.7.15.0 = += Release 1.7.16.0 = +Released: unreleased + +== Bug Fix == + * Fixed issue #1535: Unclear UI in prompt dialog of Stash Save + += Release 1.7.15.0 = Released: 2012-11-20 == Features == diff --git a/src/TortoiseProc/StashSave.cpp b/src/TortoiseProc/StashSave.cpp index b5aad50c1..ac3b1f504 100644 --- a/src/TortoiseProc/StashSave.cpp +++ b/src/TortoiseProc/StashSave.cpp @@ -88,7 +88,7 @@ void CStashSaveDlg::OnBnClickedOk() if (m_bIncludeUntracked) { - if (CMessageBox::ShowCheck(GetSafeHwnd(), IDS_STASHSAVE_INCLUDEUNTRACKED, IDS_APPNAME, 2, IDI_WARNING, IDS_CONTINUEBUTTON, IDS_ABORTBUTTON, IDS_PROC_NOTSHOWAGAINCONTINUE, _T("NoStashIncludeUntrackedWarning")) == 2) + if (CMessageBox::ShowCheck(GetSafeHwnd(), IDS_STASHSAVE_INCLUDEUNTRACKED, IDS_APPNAME, 2, IDI_WARNING, IDS_CONTINUEBUTTON, IDS_ABORTBUTTON, NULL, _T("NoStashIncludeUntrackedWarning"), IDS_PROC_NOTSHOWAGAINCONTINUE) == 2) { CRegStdDWORD(_T("Software\\TortoiseGit\\TortoiseProc\\NoStashIncludeUntrackedWarning")).removeValue(); // only store answer if it is "Continue" return; -- 2.11.4.GIT