From 2ef19858511a09ceec1269ce01261ac5c97d2d14 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Wed, 2 Sep 2009 10:44:20 +0200
Subject: debugger: fix start up of scriptengine when discovering a script
 (cherry picked from commit 5a4a376949f33a418e3b5495004afadd042d4518)

---
 src/plugins/debugger/debuggermanager.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/plugins/debugger/debuggermanager.cpp b/src/plugins/debugger/debuggermanager.cpp
index 2439aa8af41..89fac392dad 100644
--- a/src/plugins/debugger/debuggermanager.cpp
+++ b/src/plugins/debugger/debuggermanager.cpp
@@ -730,9 +730,6 @@ static IDebuggerEngine *determineDebuggerEngine(const QString &executable,
                                                 QString *errorMessage,
                                                 QString *settingsIdHint)
 {
-    if (IDebuggerEngine *tce = debuggerEngineForToolChain(static_cast<ProjectExplorer::ToolChain::ToolChainType>(toolChainType)))
-        return tce;
-
     if (executable.endsWith(_(".js"))) {
         if (!scriptEngine) {
             *errorMessage = msgEngineNotAvailable("Script Engine");
@@ -741,6 +738,9 @@ static IDebuggerEngine *determineDebuggerEngine(const QString &executable,
         return scriptEngine;
     }
 
+    if (IDebuggerEngine *tce = debuggerEngineForToolChain(static_cast<ProjectExplorer::ToolChain::ToolChainType>(toolChainType)))
+        return tce;
+
 #ifndef Q_OS_WIN
     Q_UNUSED(settingsIdHint)
     if (!gdbEngine) {
-- 
cgit v1.2.3