fix: can stop judge now

alphagocc · alphagocc · commit ff413628b969 · 2021-10-21T17:47:06.000+08:00
diff --git a/makespec/BUILDVERSION b/makespec/BUILDVERSION
@@ -1 +1 @@
-184
+185
diff --git a/src/core/judgingcontroller.cpp b/src/core/judgingcontroller.cpp
@@ -47,7 +47,7 @@ void JudgingController::taskFinished() {
 		delete taskJudger;
 	}
 	assign();
-	if (isJudging && queuingTasks.empty() && runningTasks.empty()) {
+	if (runningTasks.empty()) {
 		isJudging = false;
 		emit judgeFinished();
 	}
@@ -64,12 +64,7 @@ void JudgingController::stop() {
 	isJudging = 0;
 	for (auto [taskJudger, thread] : runningTasks.toStdMap()) {
 		QMetaObject::invokeMethod(taskJudger, &TaskJudger::stop);
-		thread->quit();
-		thread->wait();
-		delete thread;
-		delete taskJudger;
-		runningTasks.remove(taskJudger);
 	}
-	emit judgeFinished();
+	// emit judgeFinished();
 }
 void JudgingController::addTask(TaskJudger *taskJudger) { queuingTasks.push_back(taskJudger); }

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ void JudgingController::taskFinished() {`
`47`	`47`	`delete taskJudger;`
`48`	`48`	`}`
`49`	`49`	`assign();`
`50`		`- if (isJudging && queuingTasks.empty() && runningTasks.empty()) {`
	`50`	`+ if (runningTasks.empty()) {`
`51`	`51`	`isJudging = false;`
`52`	`52`	`emit judgeFinished();`
`53`	`53`	`}`
`@@ -64,12 +64,7 @@ void JudgingController::stop() {`
`64`	`64`	`isJudging = 0;`
`65`	`65`	`for (auto [taskJudger, thread] : runningTasks.toStdMap()) {`
`66`	`66`	`QMetaObject::invokeMethod(taskJudger, &TaskJudger::stop);`
`67`		`- thread->quit();`
`68`		`- thread->wait();`
`69`		`- delete thread;`
`70`		`- delete taskJudger;`
`71`		`- runningTasks.remove(taskJudger);`
`72`	`67`	`}`
`73`		`- emit judgeFinished();`
	`68`	`+ // emit judgeFinished();`
`74`	`69`	`}`
`75`	`70`	`void JudgingController::addTask(TaskJudger *taskJudger) { queuingTasks.push_back(taskJudger); }`