openocd.c: call server_quit() for cmd line with -c shutdown

[openocd] / src / openocd.c

diff --git a/src/openocd.c b/src/openocd.c
index 05533aae3528554a4e2e24342cb98407204ee4ae..739442163cddc46e10f3450fc343ed4c28b8910d 100644 (file)
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -286,10 +286,13 @@ static int openocd_thread(int argc, char *argv[], struct command_context *cmd_ct
                return ERROR_FAIL;
 
        ret = parse_config_file(cmd_ctx);
-       if (ret == ERROR_COMMAND_CLOSE_CONNECTION)
+       if (ret == ERROR_COMMAND_CLOSE_CONNECTION) {
+               server_quit(); /* gdb server may be initialized by -c init */
                return ERROR_OK;
-       else if (ret != ERROR_OK)
+       } else if (ret != ERROR_OK) {
+               server_quit(); /* gdb server may be initialized by -c init */
                return ERROR_FAIL;
+       }
 
        ret = server_init(cmd_ctx);
        if (ERROR_OK != ret)