From 87bbed870e88c62d27e84136b5f96d71183a4d30 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 2 Jun 2013 06:32:59 +0200 Subject: [PATCH] Optimized error message options for failed removal of files Signed-off-by: Sven Strickroth --- src/TortoiseProc/Commands/RemoveCommand.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/TortoiseProc/Commands/RemoveCommand.cpp b/src/TortoiseProc/Commands/RemoveCommand.cpp index fee3a9f9f..cf7368b82 100644 --- a/src/TortoiseProc/Commands/RemoveCommand.cpp +++ b/src/TortoiseProc/Commands/RemoveCommand.cpp @@ -121,7 +121,6 @@ bool RemoveCommand::Execute() //because there are command "Delete(keep local copy)" at explore context menu //int key=CMessageBox::Show(hwndExplorer, _T("File will removed from version control\r\n Do you want to keep local copy"), _T("TortoiseGit"), MB_ICONINFORMATION|MB_YESNOCANCEL); //if(key == IDCANCEL) - int key; CString format, keepLocal; if(parser.HasKey(_T("keep"))) @@ -151,8 +150,7 @@ bool RemoveCommand::Execute() cmd.Format(format,pathList[nPath].GetGitPathString()); if (g_Git.Run(cmd, &output, CP_UTF8)) { - key=CMessageBox::Show(hwndExplorer, output, _T("TortoiseGit"), MB_ICONERROR|MB_OKCANCEL); - if(key == IDCANCEL) + if (CMessageBox::Show(hwndExplorer, output, _T("TortoiseGit"), 2, IDI_ERROR, CString(MAKEINTRESOURCE(IDS_IGNOREBUTTON)), CString(MAKEINTRESOURCE(IDS_ABORTBUTTON))) == 2) return FALSE; } } -- 2.11.4.GIT