Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tobias Hunger
qt-creator
Commits
5ddf7d3c
Commit
5ddf7d3c
authored
Mar 01, 2011
by
Friedemann Kleint
Browse files
Symbian: Fix CODA shutdown after debuggee crash.
parent
de9a5c9e
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/plugins/debugger/gdb/codagdbadapter.cpp
View file @
5ddf7d3c
...
...
@@ -988,10 +988,11 @@ void CodaGdbAdapter::sendRunControlTerminateCommand()
void
CodaGdbAdapter
::
handleRunControlTerminate
(
const
CodaCommandResult
&
)
{
QString
msg
=
QString
::
fromLatin1
(
"CODA disconnected"
);
const
bool
emergencyShutdown
=
m_gdbProc
.
state
()
!=
QProcess
::
Running
;
const
bool
emergencyShutdown
=
m_gdbProc
.
state
()
!=
QProcess
::
Running
&&
state
()
!=
EngineShutdownOk
;
if
(
emergencyShutdown
)
msg
+=
QString
::
fromLatin1
(
" (emergency shutdown"
);
logMessage
(
msg
);
msg
+=
QString
::
fromLatin1
(
" (emergency shutdown
)
"
);
logMessage
(
msg
,
LogMisc
);
if
(
emergencyShutdown
)
{
cleanup
();
m_engine
->
notifyAdapterShutdownOk
();
...
...
src/plugins/debugger/gdb/gdbengine.cpp
View file @
5ddf7d3c
...
...
@@ -1752,6 +1752,10 @@ void GdbEngine::notifyAdapterShutdownFailed()
void
GdbEngine
::
notifyAdapterShutdownOk
()
{
QTC_ASSERT
(
state
()
==
EngineShutdownRequested
,
qDebug
()
<<
state
());
if
(
state
()
!=
EngineShutdownRequested
)
{
qDebug
(
"XXXXX"
);
showMessage
(
_
(
"ASSERT"
));
}
showMessage
(
_
(
"INITIATE GDBENGINE SHUTDOWN IN STATE %1, PROC: %2"
)
.
arg
(
lastGoodState
()).
arg
(
gdbProc
()
->
state
()));
m_commandsDoneCallback
=
0
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment