\r
if(hashOld == hashNew)\r
{\r
- CMessageBox::Show(NULL, L"Already up to date.", L"Pull", MB_OK | MB_ICONINFORMATION);\r
+ if(progress.m_GitStatus == 0)\r
+ CMessageBox::Show(NULL, L"Already up to date.", L"Pull", MB_OK | MB_ICONINFORMATION);\r
return TRUE;\r
}\r
\r
IMPLEMENT_DYNAMIC(CProgressDlg, CResizableStandAloneDialog)\r
\r
CProgressDlg::CProgressDlg(CWnd* pParent /*=NULL*/)\r
- : CResizableStandAloneDialog(CProgressDlg::IDD, pParent), m_bShowCommand(true), m_bAutoCloseOnSuccess(false), m_bAbort(false)\r
+ : CResizableStandAloneDialog(CProgressDlg::IDD, pParent), m_bShowCommand(true), m_bAutoCloseOnSuccess(false), m_bAbort(false), m_bDone(false)\r
{\r
\r
}\r
}\r
if(wParam == MSG_PROGRESSDLG_END || wParam == MSG_PROGRESSDLG_FAILED)\r
{\r
+ m_bDone = true;\r
m_Animate.Stop();\r
m_Progress.SetPos(100);\r
this->DialogEnableWindow(IDOK,TRUE);\r
- if(wParam == MSG_PROGRESSDLG_END)\r
+ if(wParam == MSG_PROGRESSDLG_END && m_GitStatus == 0)\r
{\r
if(m_bAutoCloseOnSuccess)\r
EndDialog(IDOK);\r
- if(m_changeAbortButtonOnSuccessTo.IsEmpty())\r
+ if(!m_changeAbortButtonOnSuccessTo.IsEmpty())\r
{\r
GetDlgItem(IDCANCEL)->SetWindowText(m_changeAbortButtonOnSuccessTo);\r
}\r
\r
void CProgressDlg::OnCancel()\r
{\r
+ if(m_bDone)\r
+ {\r
+ CResizableStandAloneDialog::OnCancel();\r
+ return;\r
+ }\r
+\r
m_bAbort = true;\r
}\r