Revision: 2224 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2224&view=re... Author: cesspit Date: 2011-10-03 16:46:34 +0000 (Mon, 03 Oct 2011) Log Message: ----------- debugger: reset terminal after restart, restart only when stopped on end range or break

Modified Paths: -------------- trunk/geany-plugins/debugger/src/btnpanel.c trunk/geany-plugins/debugger/src/debug.c

Modified: trunk/geany-plugins/debugger/src/btnpanel.c =================================================================== --- trunk/geany-plugins/debugger/src/btnpanel.c 2011-10-03 14:36:50 UTC (rev 2223) +++ trunk/geany-plugins/debugger/src/btnpanel.c 2011-10-03 16:46:34 UTC (rev 2224) @@ -156,7 +156,7 @@ } gtk_widget_set_sensitive(runbtn, DBS_IDLE == state || DBS_STOPPED == state); - gtk_widget_set_sensitive(restartbtn, DBS_IDLE != state); + gtk_widget_set_sensitive(restartbtn, DBS_STOPPED == state); gtk_widget_set_sensitive(stopbtn, DBS_IDLE != state); gtk_widget_set_sensitive(stepoverbtn, DBS_STOPPED == state);

Modified: trunk/geany-plugins/debugger/src/debug.c =================================================================== --- trunk/geany-plugins/debugger/src/debug.c 2011-10-03 14:36:50 UTC (rev 2223) +++ trunk/geany-plugins/debugger/src/debug.c 2011-10-03 16:46:34 UTC (rev 2224) @@ -98,11 +98,6 @@ */ gboolean exit_pending = FALSE;

-/* flag to set when debug restart is requested while debugger is running. - * Then this flag is set to TRUE, and debug_request_interrupt function is called - */ -gboolean restart_pending = FALSE; - /* debug terminal PTY master/slave file descriptors */ int pty_master, pty_slave;

@@ -631,15 +626,6 @@ return; }

- /* if a restart was requested for asyncronous exiting - - * restart debug module and exit */ - if (restart_pending) - { - active_module->restart(); - restart_pending = FALSE; - return; - } - /* check for async activities pending */ if (interrupt_data) { @@ -1137,15 +1123,10 @@ if (DBS_STOPPED == debug_state) { /* stop instantly if not running */ + vte_terminal_reset(VTE_TERMINAL(terminal), TRUE, TRUE); active_module->restart(); debug_state = DBS_RUN_REQUESTED; } - else if (DBS_IDLE != debug_state) - { - /* if running - request interrupt */ - restart_pending = TRUE; - active_module->request_interrupt(); - } }

/*

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.