From 92f14ae1e39d4cc226c05486fe34b0129c0d44df Mon Sep 17 00:00:00 2001 From: Eugene Yakavets Date: Wed, 9 Feb 2022 10:24:50 +0300 Subject: [PATCH] [platform] use default update channel for 'Check for Updates' when selection combobox is not present If an IDE disables combobox which allows users to change update channel, 'Check for Updates' button should use the default channel, not the first available channel as it was before. GitOrigin-RevId: 246feb949c69af0f8d53ca8b15966fe282495273 --- .../openapi/updateSettings/impl/UpdateSettingsConfigurable.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsConfigurable.kt b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsConfigurable.kt index cb8dc6d900be..e9bdcceb5cb2 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsConfigurable.kt +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsConfigurable.kt @@ -81,7 +81,9 @@ class UpdateSettingsConfigurable @JvmOverloads constructor (private val checkNow settingsCopy.state.copyFrom(settings.state) settingsCopy.state.isCheckNeeded = true settingsCopy.state.isPluginsCheckNeeded = true - settingsCopy.selectedChannelStatus = selectedChannel(channelModel.selected) + if (channelSelectionLockedMessage == null) { + settingsCopy.selectedChannelStatus = selectedChannel(channelModel.selected) + } UpdateChecker.updateAndShowResult(project, settingsCopy) updateLastCheckedLabel(settings.lastTimeChecked) }