2.0

a065554d · keyongyu · 7e704d8b · a065554d · a065554d · a065554d
Commit a065554d authored Oct 21, 2014 by keyongyu
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 6 deletions

DataEditorX/DataEditForm.cs DataEditorX/DataEditForm.cs +9 -6

win32/DataEditorX.exe win32/DataEditorX.exe +0 -0

win32/win32.zip win32/win32.zip +0 -0

No files found.
--- a/DataEditorX/DataEditForm.cs
+++ b/DataEditorX/DataEditForm.cs
@@ -1028,12 +1028,15 @@ void checkupdate(bool showNew)
 		}
 		bool CancelTask()
 		{
-			bool bl=MyMsg.Question(LMSG.IfCancelTask);
+			bool bl=false;
-			if(bl){
+			if(tasker !=null && tasker.IsRuning()){
-				if(tasker!=null)
+				bl=MyMsg.Question(LMSG.IfCancelTask);
-					tasker.Cancel();
+				if(bl){
-				if(bgWorker1.IsBusy)
+					if(tasker!=null)
-					bgWorker1.CancelAsync();
+						tasker.Cancel();
+					if(bgWorker1.IsBusy)
+						bgWorker1.CancelAsync();
+				}
 			}
 			return bl;
 		}

--- a/win32/DataEditorX.exe
+++ b/win32/DataEditorX.exe
--- a/win32/win32.zip
+++ b/win32/win32.zip