nemiver r822 - in branches/0.5: . src/dbgengine src/persp/dbgperspective

[dodji svn gnome org]

Author: dodji
Date: Sun May 25 20:25:30 2008
New Revision: 822
URL: http://svn.gnome.org/viewvc/nemiver?rev=822&view=rev

Log:
#534619 properly detach from target

	* src/dbgengine/nmv-gdb-engine.cc:
	  (in the OnCommandDoneHandler): don't set the engine state to
	  IDebugger::READY when the command that has been DONE is
	  "detach-from-target". This should fix #534619

This is a merge from trunk.
The command line was:
svn merge -r819:820 svn+ssh://svn.gnome.org/svn/nemiver/trunk



Modified:
   branches/0.5/ChangeLog
   branches/0.5/src/dbgengine/nmv-gdb-engine.cc
   branches/0.5/src/persp/dbgperspective/nmv-dbg-perspective.cc

Modified: branches/0.5/src/dbgengine/nmv-gdb-engine.cc
==============================================================================
--- branches/0.5/src/dbgengine/nmv-gdb-engine.cc	(original)
+++ branches/0.5/src/dbgengine/nmv-gdb-engine.cc	Sun May 25 20:25:30 2008
@@ -1216,7 +1216,9 @@
         //TODO: this is not necessarily true. Before setting the state
         //to ready here, one must now which command exactly was fired so
         //that gdb returned the "DONE" status for it.
-        m_engine->set_state (IDebugger::READY);
+        if (a_in.command ().name () != "detach-from-target") {
+            m_engine->set_state (IDebugger::READY);
+        }
     }
 };//struct OnCommandDoneHandler
 
@@ -2161,6 +2163,7 @@
 {
     LOG_FUNCTION_SCOPE_NORMAL_DD;
     THROW_IF_FAIL (m_priv);
+    LOG_DD ("is_attached: " << (int)m_priv->is_attached);
     return m_priv->is_attached;
 }
 

Modified: branches/0.5/src/persp/dbgperspective/nmv-dbg-perspective.cc
==============================================================================
--- branches/0.5/src/persp/dbgperspective/nmv-dbg-perspective.cc	(original)
+++ branches/0.5/src/persp/dbgperspective/nmv-dbg-perspective.cc	Sun May 25 20:25:30 2008
@@ -1400,6 +1400,8 @@
     THROW_IF_FAIL (m_priv->debugger_ready_action_group) ;
     THROW_IF_FAIL (m_priv->throbber) ;
 
+    LOG_DD ("a_is_ready: " << (int)a_is_ready);
+
     if (a_is_ready) {
         // reset to default cursor
         workbench ().get_root_window ().get_window ()->set_cursor ();