From 2e7361bb1e706f037b27776f84d97259e10e7870 Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Tue, 17 May 2016 14:27:04 +0200
Subject: [PATCH] Valgrind: Avoid crash when having no configured runnable
Change-Id: Ie4da5712f68176e26aaf5cda1bc1f6cb74899970
Reviewed-by: hjk <hjk@theqtcompany.com>
---
src/plugins/valgrind/valgrindruncontrolfactory.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/plugins/valgrind/valgrindruncontrolfactory.cpp b/src/plugins/valgrind/valgrindruncontrolfactory.cpp
index f1338b16655..fd574c4afa4 100644
--- a/src/plugins/valgrind/valgrindruncontrolfactory.cpp
+++ b/src/plugins/valgrind/valgrindruncontrolfactory.cpp
@@ -49,7 +49,8 @@ ValgrindRunControlFactory::ValgrindRunControlFactory(QObject *parent) :
bool ValgrindRunControlFactory::canRun(RunConfiguration *runConfiguration, Core::Id mode) const
{
- Q_UNUSED(runConfiguration);
+ if (runConfiguration && !runConfiguration->runnable().is<StandardRunnable>())
+ return false;
return mode == CALLGRIND_RUN_MODE || mode == MEMCHECK_RUN_MODE || mode == MEMCHECK_WITH_GDB_RUN_MODE;
}
--
GitLab