From 1bc3cccbb444b078db2e5e0a1cd4ecd4debd0358 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Wed, 31 May 2023 12:15:48 +0200 Subject: [PATCH] Copilot: Do not try to start copilot without nodejs Avoids the attempt to start the client if nodejs cannot be found. Change-Id: I3783280120ca754291a92b3308c1192906facd08 Reviewed-by: Marcus Tillmanns --- src/plugins/copilot/authwidget.cpp | 2 +- src/plugins/copilot/copilotplugin.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/plugins/copilot/authwidget.cpp b/src/plugins/copilot/authwidget.cpp index 31b4660b680..f29e3d3a150 100644 --- a/src/plugins/copilot/authwidget.cpp +++ b/src/plugins/copilot/authwidget.cpp @@ -93,7 +93,7 @@ void AuthWidget::updateClient(const Utils::FilePath &nodeJs, const Utils::FilePa m_client = nullptr; setState(Tr::tr("Sign in"), false); m_button->setEnabled(false); - if (!nodeJs.exists() || !agent.exists()) { + if (!nodeJs.isExecutableFile() || !agent.exists()) { return; } diff --git a/src/plugins/copilot/copilotplugin.cpp b/src/plugins/copilot/copilotplugin.cpp index 43effda321c..526a6061cbe 100644 --- a/src/plugins/copilot/copilotplugin.cpp +++ b/src/plugins/copilot/copilotplugin.cpp @@ -120,6 +120,9 @@ void CopilotPlugin::extensionsInitialized() void CopilotPlugin::restartClient() { LanguageClient::LanguageClientManager::shutdownClient(m_client); + + if (!CopilotSettings::instance().nodeJsPath().isExecutableFile()) + return; m_client = new CopilotClient(CopilotSettings::instance().nodeJsPath(), CopilotSettings::instance().distPath()); }