X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fopenocd.c;h=f084dd4522d6294e027578982f803d9c9b86927b;hb=82dd17e2488ae233d8818901ec6f07525694e55e;hp=1874530cb2fc4d053052835e19febf591c1599e2;hpb=f035b0851bbc6a9ccc2b20128ae2e4d3abd9ba38;p=openocd.git

diff --git a/src/openocd.c b/src/openocd.c
index 1874530cb2..f084dd4522 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -87,13 +87,13 @@ static int log_target_callback_event_handler(struct target *target,
 {
 	switch (event) {
 		case TARGET_EVENT_GDB_START:
-			target->display = 0;
+			target->verbose_halt_msg = false;
 			break;
 		case TARGET_EVENT_GDB_END:
-			target->display = 1;
+			target->verbose_halt_msg = true;
 			break;
 		case TARGET_EVENT_HALTED:
-			if (target->display) {
+			if (target->verbose_halt_msg) {
 				/* do not display information when debugger caused the halt */
 				target_arch_state(target);
 			}
@@ -359,11 +359,15 @@ int openocd_main(int argc, char *argv[])
 
 	unregister_all_commands(cmd_ctx, NULL);
 
-	/* Shutdown commandline interface */
-	command_exit(cmd_ctx);
+	/* free all DAP and CTI objects */
+	dap_cleanup_all();
+	arm_cti_cleanup_all();
 
 	adapter_quit();
 
+	/* Shutdown commandline interface */
+	command_exit(cmd_ctx);
+
 	free_config();
 
 	if (ERROR_FAIL == ret)