fix RIDER-85695 Unity doesn't start from the toolbar if Android plugi…

…n is installed
JetBrains · Nov 30, 2022 · 21ac484 · 21ac484
1 parent c0eadd8
commit 21ac484
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/rider/src/main/kotlin/com/jetbrains/rider/plugins/unity/actions/AttachToUnityEditorAction.kt b/rider/src/main/kotlin/com/jetbrains/rider/plugins/unity/actions/AttachToUnityEditorAction.kt
@@ -22,7 +22,7 @@ class AttachUnityEditorAction: DumbAwareAction() {
 
         if (settings != null) {
             ExecutionUtil.runConfiguration(settings,
-                Executor.EXECUTOR_EXTENSION_NAME.extensionList.single { it is DefaultDebugExecutor })
+                Executor.EXECUTOR_EXTENSION_NAME.extensionList.single { it is DefaultDebugExecutor && it.id == DefaultDebugExecutor.EXECUTOR_ID })
         } else {
             logger.warn("Have not found run-configuration ${DefaultRunConfigurationGenerator.ATTACH_CONFIGURATION_NAME}.")
         }

diff --git a/rider/src/main/kotlin/com/jetbrains/rider/plugins/unity/actions/StartUnityAction.kt b/rider/src/main/kotlin/com/jetbrains/rider/plugins/unity/actions/StartUnityAction.kt
@@ -47,7 +47,7 @@ open class StartUnityAction : DumbAwareAction() {
                 runManager.findConfigurationByTypeAndName(UnityExeConfigurationType.id, DefaultRunConfigurationGenerator.RUN_DEBUG_START_UNITY_CONFIGURATION_NAME)
 
             if (settings?.configuration != null && ExecutionTargetManager.getInstance(project).getTargetsFor(settings.configuration).isEmpty()){
-                ExecutionUtil.runConfiguration(settings, Executor.EXECUTOR_EXTENSION_NAME.extensionList.single {it is DefaultRunExecutor })
+                ExecutionUtil.runConfiguration(settings, Executor.EXECUTOR_EXTENSION_NAME.extensionList.single {it is DefaultRunExecutor && it.id == DefaultRunExecutor.EXECUTOR_ID})
             }
             else {
                 logger.warn("UnityExeConfiguration ${DefaultRunConfigurationGenerator.RUN_DEBUG_START_UNITY_CONFIGURATION_NAME} was not found.")