@@ -54,6 +54,7 @@ import kotlinx.coroutines.CoroutineScope
54
54
import kotlinx.coroutines.Dispatchers
55
55
import kotlinx.coroutines.Job
56
56
import kotlinx.coroutines.cancelAndJoin
57
+ import kotlinx.coroutines.job
57
58
import kotlinx.coroutines.launch
58
59
import org.jetbrains.plugins.gradle.util.GradleUtil
59
60
@@ -68,8 +69,9 @@ class MinecraftFacetDetector : ProjectActivity {
68
69
69
70
override suspend fun execute (project : Project ) {
70
71
val detectorService = project.service<FacetDetectorScopeProvider >()
71
- detectorService.currentJob?.let { it. cancelAndJoin() }
72
+ detectorService.currentJob?.cancelAndJoin()
72
73
withBackgroundProgress(project, " Detecting Minecraft Frameworks" , cancellable = false ) {
74
+ detectorService.currentJob = coroutineContext.job
73
75
MinecraftModuleRootListener .doCheck(project)
74
76
}
75
77
}
@@ -88,8 +90,9 @@ class MinecraftFacetDetector : ProjectActivity {
88
90
val project = event.source as ? Project ? : return
89
91
val detectorService = project.service<FacetDetectorScopeProvider >()
90
92
detectorService.scope.launch {
91
- detectorService.currentJob?.let { it. cancelAndJoin() }
93
+ detectorService.currentJob?.cancelAndJoin()
92
94
withBackgroundProgress(project, " Detecting Minecraft Frameworks" , cancellable = false ) {
95
+ detectorService.currentJob = coroutineContext.job
93
96
doCheck(project)
94
97
}
95
98
}
0 commit comments