Skip to content

Commit 21ac484

Browse files
committed
fix RIDER-85695 Unity doesn't start from the toolbar if Android plugin is installed
1 parent c0eadd8 commit 21ac484

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

rider/src/main/kotlin/com/jetbrains/rider/plugins/unity/actions/AttachToUnityEditorAction.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class AttachUnityEditorAction: DumbAwareAction() {
2222

2323
if (settings != null) {
2424
ExecutionUtil.runConfiguration(settings,
25-
Executor.EXECUTOR_EXTENSION_NAME.extensionList.single { it is DefaultDebugExecutor })
25+
Executor.EXECUTOR_EXTENSION_NAME.extensionList.single { it is DefaultDebugExecutor && it.id == DefaultDebugExecutor.EXECUTOR_ID })
2626
} else {
2727
logger.warn("Have not found run-configuration ${DefaultRunConfigurationGenerator.ATTACH_CONFIGURATION_NAME}.")
2828
}

rider/src/main/kotlin/com/jetbrains/rider/plugins/unity/actions/StartUnityAction.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ open class StartUnityAction : DumbAwareAction() {
4747
runManager.findConfigurationByTypeAndName(UnityExeConfigurationType.id, DefaultRunConfigurationGenerator.RUN_DEBUG_START_UNITY_CONFIGURATION_NAME)
4848

4949
if (settings?.configuration != null && ExecutionTargetManager.getInstance(project).getTargetsFor(settings.configuration).isEmpty()){
50-
ExecutionUtil.runConfiguration(settings, Executor.EXECUTOR_EXTENSION_NAME.extensionList.single {it is DefaultRunExecutor })
50+
ExecutionUtil.runConfiguration(settings, Executor.EXECUTOR_EXTENSION_NAME.extensionList.single {it is DefaultRunExecutor && it.id == DefaultRunExecutor.EXECUTOR_ID})
5151
}
5252
else {
5353
logger.warn("UnityExeConfiguration ${DefaultRunConfigurationGenerator.RUN_DEBUG_START_UNITY_CONFIGURATION_NAME} was not found.")

0 commit comments

Comments
 (0)