Commit d8cc842d authored by hjk's avatar hjk

debugger: let 'Reset Debugger' apply a bit more force

parent 11993d19
......@@ -543,7 +543,7 @@ void DebuggerManager::init()
connect(d->m_actions.stopAction, SIGNAL(triggered()),
this, SLOT(interruptDebuggingRequest()));
connect(d->m_actions.resetAction, SIGNAL(triggered()),
this, SLOT(exitDebugger()));
this, SLOT(abortDebugger()));
connect(d->m_actions.nextAction, SIGNAL(triggered()),
this, SLOT(executeStepNext()));
connect(d->m_actions.stepAction, SIGNAL(triggered()),
......@@ -1146,6 +1146,13 @@ void DebuggerManager::exitDebugger()
d->m_codeModelSnapshot = CPlusPlus::Snapshot();
}
void DebuggerManager::abortDebugger()
{
if (d->m_engine && state() != DebuggerNotReady)
d->m_engine->abortDebugger();
d->m_codeModelSnapshot = CPlusPlus::Snapshot();
}
DebuggerStartParametersPtr DebuggerManager::startParameters() const
{
return d->m_startParameters;
......
......@@ -201,6 +201,7 @@ public:
public slots:
void startNewDebugger(const DebuggerStartParametersPtr &sp);
void exitDebugger();
void abortDebugger();
void setSimpleDockWidgetArrangement(const QString &activeLanguage);
......
......@@ -1714,6 +1714,13 @@ void GdbEngine::exitDebugger() // called from the manager
shutdown();
}
void GdbEngine::abortDebugger() // called from the manager
{
disconnectDebuggingHelperActions();
shutdown();
m_gdbProc.kill();
}
int GdbEngine::currentFrame() const
{
return manager()->stackHandler()->currentIndex();
......
......@@ -109,6 +109,7 @@ private: ////////// General Interface //////////
virtual void startDebugger(const DebuggerStartParametersPtr &sp);
virtual unsigned debuggerCapabilities() const;
virtual void exitDebugger();
virtual void abortDebugger();
virtual void detachDebugger();
virtual void shutdown();
......
......@@ -74,6 +74,7 @@ public:
virtual void setToolTipExpression(const QPoint &mousePos, TextEditor::ITextEditor *editor, int cursorPos) = 0;
virtual void startDebugger(const DebuggerStartParametersPtr &startParameters) = 0;
virtual void exitDebugger() = 0;
virtual void abortDebugger() { exitDebugger(); }
virtual void detachDebugger() {}
virtual void updateWatchData(const WatchData &data) = 0;
......
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