X-Git-Url: http://git.sourceforge.jp/view?p=tortoisegit%2FTortoiseGitJp.git;a=blobdiff_plain;f=src%2FTortoiseProc%2FCommitDlg.cpp;h=ac04831dfb77ddba287eba5ff366dc77dac52908;hp=0dbf8e69b3af12969e185683a89591f530d837a7;hb=21d1057db51bb3d341aff40e6b71efebdc5d5026;hpb=a12360284cef2f19ef670b8db587a1b02201cea2

diff --git a/src/TortoiseProc/CommitDlg.cpp b/src/TortoiseProc/CommitDlg.cpp
index 0dbf8e6..ac04831 100644
--- a/src/TortoiseProc/CommitDlg.cpp
+++ b/src/TortoiseProc/CommitDlg.cpp
@@ -59,6 +59,7 @@ CCommitDlg::CCommitDlg(CWnd* pParent /*=NULL*/)
 	, m_bSelectFilesForCommit(TRUE)
 {
 	this->m_bCommitAmend=FALSE;
+	m_bPushAfterCommit = FALSE;
 }
 
 CCommitDlg::~CCommitDlg()
@@ -513,13 +514,15 @@ void CCommitDlg::OnOK()
 		else if(userResponse == IDCANCEL)
 		{
 			//User pressed 'Push' button after successful commit.
-			PushCommand cmdPush;
-			cmdPush.Execute();
+			m_bPushAfterCommit=true;
 		}
 
 		CFile::Remove(tempfile);
 	}else
-		CMessageBox::Show(this->m_hWnd, _T("Nothing Commit"), _T("Commit Finish"), MB_OK | MB_ICONINFORMATION);
+	{
+		CMessageBox::Show(this->m_hWnd, IDS_ERROR_NOTHING_COMMIT, IDS_COMMIT_FINISH, MB_OK | MB_ICONINFORMATION);
+		bCloseCommitDlg=false;
+	}
 #if 0
 	if (m_pathwatcher.GetNumberOfChangedPaths() && m_bRecursive)
 	{