Commit 66896e19 authored by hjk's avatar hjk
Browse files

debugger: more verbose status message on sigsegv even if messagebox was disabled

parent 5f38a26c
...@@ -1523,7 +1523,7 @@ QString DebuggerEngine::msgStopped(const QString &reason) ...@@ -1523,7 +1523,7 @@ QString DebuggerEngine::msgStopped(const QString &reason)
QString DebuggerEngine::msgStoppedBySignal(const QString &meaning, QString DebuggerEngine::msgStoppedBySignal(const QString &meaning,
const QString &name) const QString &name)
{ {
return tr("Stopped: %1 by signal %2.").arg(meaning, name); return tr("Stopped: %1 (Signal %2).").arg(meaning, name);
} }
QString DebuggerEngine::msgStoppedByException(const QString &description, QString DebuggerEngine::msgStoppedByException(const QString &description,
......
...@@ -1504,8 +1504,7 @@ void GdbEngine::handleStop1(const GdbMi &data) ...@@ -1504,8 +1504,7 @@ void GdbEngine::handleStop1(const GdbMi &data)
m_currentThread = threadId; m_currentThread = threadId;
} else { } else {
QString reasontr = msgStopped(_(reason)); QString reasontr = msgStopped(_(reason));
if (reason == "signal-received" if (reason == "signal-received") {
&& debuggerCore()->boolSetting(UseMessageBoxForSignals)) {
QByteArray name = data.findChild("signal-name").data(); QByteArray name = data.findChild("signal-name").data();
QByteArray meaning = data.findChild("signal-meaning").data(); QByteArray meaning = data.findChild("signal-meaning").data();
// Ignore these as they are showing up regularly when // Ignore these as they are showing up regularly when
...@@ -1517,7 +1516,8 @@ void GdbEngine::handleStop1(const GdbMi &data) ...@@ -1517,7 +1516,8 @@ void GdbEngine::handleStop1(const GdbMi &data)
showMessage(_(CROSS_STOP_SIGNAL " CONSIDERED HARMLESS. CONTINUING.")); showMessage(_(CROSS_STOP_SIGNAL " CONSIDERED HARMLESS. CONTINUING."));
} else { } else {
showMessage(_("HANDLING SIGNAL" + name)); showMessage(_("HANDLING SIGNAL" + name));
showStoppedBySignalMessageBox(_(meaning), _(name)); if (debuggerCore()->boolSetting(UseMessageBoxForSignals))
showStoppedBySignalMessageBox(_(meaning), _(name));
if (!name.isEmpty() && !meaning.isEmpty()) if (!name.isEmpty() && !meaning.isEmpty())
reasontr = msgStoppedBySignal(_(meaning), _(name)); reasontr = msgStoppedBySignal(_(meaning), _(name));
} }
......
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