fix: Open settings dialog the program crash

as title Log: fix issue
linuxdeepin · Nov 5, 2024 · f636ee2 · f636ee2
1 parent 308897a
commit f636ee2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/src/plugins/cxx/cmake/settings/compileroptionwidget.cpp b/src/plugins/cxx/cmake/settings/compileroptionwidget.cpp
@@ -70,11 +70,15 @@ void CompilerOptionWidgetPrivate::initCompilers()
     const auto &data = toolCD.getToolChanins();
     ToolChainData::Params cParams = data.value(kCCompilers);
     for (const auto &param : cParams) {
+        if (param.name.isEmpty() || param.path.isEmpty())
+            continue;
         appendCompiler(param.name, param.path, DetectedCCompiler);
     }
 
     ToolChainData::Params cxxParams = data.value(kCXXCompilers);
     for (const auto &param : cxxParams) {
+        if (param.name.isEmpty() || param.path.isEmpty())
+            continue;
         appendCompiler(param.name, param.path, DetectedCXXCompiler);
     }
 }

diff --git a/src/plugins/cxx/cmake/settings/debuggeroptionwidget.cpp b/src/plugins/cxx/cmake/settings/debuggeroptionwidget.cpp
@@ -55,6 +55,8 @@ void DebuggerOptionWidgetPrivate::initDebuggers()
     const auto &data = toolCD.getToolChanins();
     ToolChainData::Params params = data.value(kCCXXDebuggers);
     for (const auto &param : params) {
+        if (param.name.isEmpty() || param.path.isEmpty())
+            continue;
         appendDebugger(param.name, param.path, Detected);
     }
 }

diff --git a/src/plugins/cxx/cmake/settings/tooloptionwidget.cpp b/src/plugins/cxx/cmake/settings/tooloptionwidget.cpp
@@ -55,6 +55,8 @@ void ToolOptionWidgetPrivate::initTools()
     const auto &data = toolCD.getToolChanins();
     ToolChainData::Params params = data.value(kCCXXBuildSystems);
     for (const auto &param : params) {
+        if (param.name.isEmpty() || param.path.isEmpty())
+            continue;
         appendTool(param.name, param.path, Detected);
     }
 }

diff --git a/src/plugins/python/python/option/interpreterwidget.cpp b/src/plugins/python/python/option/interpreterwidget.cpp
@@ -120,6 +120,7 @@ class InterpreterWidgetPrivate
 
     InterpreterModel *model = nullptr;
     QSharedPointer<ToolChainData> toolChainData;
+    QMutex mutex;
 };
 
 InterpreterWidget::InterpreterWidget(QWidget *parent)
@@ -264,7 +265,7 @@ void InterpreterWidget::findPackages(const QString &cmd)
 {
     QProcess process;
     connect(&process, static_cast<void (QProcess::*)(int,QProcess::ExitStatus)>(&QProcess::finished),
-            [&](int exitcode, QProcess::ExitStatus exitStatus) {
+            &process, [&](int exitcode, QProcess::ExitStatus exitStatus) {
         if (0 == exitcode && exitStatus == QProcess::ExitStatus::NormalExit) {
             QString output = QString(process.readAllStandardOutput());
 
@@ -282,6 +283,7 @@ void InterpreterWidget::findPackages(const QString &cmd)
                     dataVector.append(QPair<QString, QString>(sublist.at(0).trimmed(), sublist.at(1).trimmed()));
                 }
             }
+            QMutexLocker lk(&d->mutex);
             d->model->setCustomData(dataVector);
         } else {
             qInfo() << "Error" << exitcode << exitStatus;