summaryrefslogtreecommitdiff
path: root/win32/droplet/progressdlg.cpp
diff options
context:
space:
mode:
authorStef Walter <stef@thewalter.net>2004-08-23 22:35:21 +0000
committerStef Walter <stef@thewalter.net>2004-08-23 22:35:21 +0000
commitff26b4137c6dc3d622336e725bd6f5630b301027 (patch)
tree536fa628fb74422adcd7486c5e483e6a6c5e354d /win32/droplet/progressdlg.cpp
parent8396a35831f126f9b7281746b90f6b00effd6da2 (diff)
Fixes and changes due to RTF converter not working properly.
Diffstat (limited to 'win32/droplet/progressdlg.cpp')
-rw-r--r--win32/droplet/progressdlg.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/win32/droplet/progressdlg.cpp b/win32/droplet/progressdlg.cpp
index 53f5e14..acba362 100644
--- a/win32/droplet/progressdlg.cpp
+++ b/win32/droplet/progressdlg.cpp
@@ -30,6 +30,7 @@ ProgressDlg::ProgressDlg()
m_flip = false;
m_hThread = NULL;
m_hEvent = NULL;
+ m_isCancelled = false;
InitializeCriticalSection(&m_sec);
}
@@ -192,9 +193,13 @@ LRESULT ProgressDlg::onInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL&
// Dialog was closed
LRESULT ProgressDlg::onClose(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
{
+ EnterCriticalSection(&m_sec);
+ m_isCancelled = true;
+ LeaveCriticalSection(&m_sec);
+
// TODO: will this get called by NC area?
EndDialog(IDOK);
- return 0;
+ return 1;
}
// onCancel: ------------------------------------------------------------------