X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fopenocd.c;h=83329b519233c48b9857157932aaf34e8ecb237d;hb=6f5e9941df0f92eac5fa955cc96221da907451b1;hp=94fab3a94e891ab5e9596325e6437a46e068207f;hpb=3a4af874874ad623553ac061a771d428bce1e814;p=openocd.git

diff --git a/src/openocd.c b/src/openocd.c
index 94fab3a94e..83329b5192 100644
--- a/src/openocd.c
+++ b/src/openocd.c
@@ -297,8 +297,10 @@ static int openocd_thread(int argc, char *argv[], struct command_context *cmd_ct
 
 	if (init_at_startup) {
 		ret = command_run_line(cmd_ctx, "init");
-		if (ERROR_OK != ret)
+		if (ERROR_OK != ret) {
+			server_quit();
 			return ERROR_FAIL;
+		}
 	}
 
 	ret = server_loop(cmd_ctx);