Commit ea210195 authored by con's avatar con
Browse files

debugger: move watchdog timeout initialization to a place where it actually...

debugger: move watchdog timeout initialization to a place where it actually can access the stored settings.

(cherry picked from commit de23834f)

Conflicts:

	src/plugins/debugger/gdb/gdbengine.cpp
parent e80e5e55
......@@ -195,8 +195,6 @@ GdbEngine::GdbEngine(DebuggerManager *manager) :
m_commandTimer = new QTimer(this);
m_commandTimer->setSingleShot(true);
QVariant timeOut = theDebuggerAction(GdbWatchdogTimeout)->value();
m_commandTimer->setInterval(1000 * qMax(20, timeOut.toInt()));
connect(m_commandTimer, SIGNAL(timeout()), SLOT(commandTimeout()));
// Needs no resetting in initializeVariables()
......@@ -4376,7 +4374,8 @@ bool GdbEngine::startGdb(const QStringList &args, const QString &gdb, const QStr
SLOT(readGdbStandardError()));
debugMessage(_("GDB STARTED, INITIALIZING IT"));
m_commandTimer->setInterval(commandTimeoutTime());
int timeOut = theDebuggerAction(GdbWatchdogTimeout)->value().toInt();
m_commandTimer->setInterval(1000 * qMax(20, timeOut));
postCommand(_("show version"), CB(handleShowVersion));
postCommand(_("-interpreter-exec console \"help bb\""),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment