refactor quitconfirm in debug session

rizinorg · Oct 21, 2023 · de189da · de189da
1 parent 90166d7
commit de189da
Showing 1 changed file with 15 additions and 19 deletions.
diff --git a/librz/main/rizin.c b/librz/main/rizin.c
@@ -1453,25 +1453,6 @@ RZ_API int rz_main_rizin(int argc, const char **argv) {
 				}
 			}
 
-			if (debug) {
-				if (no_question_debug) {
-					if (rz_config_get_i(r->config, "dbg.exitkills") && y_kill_debug) {
-						rz_debug_kill(r->dbg, r->dbg->pid, r->dbg->tid, 9); // KILL
-					}
-				} else {
-					if (rz_cons_yesno('y', "Do you want to quit? (Y/n)")) {
-						if (rz_config_get_i(r->config, "dbg.exitkills") &&
-							rz_debug_can_kill(r->dbg) &&
-							rz_cons_yesno('y', "Do you want to kill the process? (Y/n)")) {
-							rz_config_set_i(r->config, "scr.confirmquit", false);
-							rz_debug_kill(r->dbg, r->dbg->pid, r->dbg->tid, 9); // KILL
-						}
-					} else {
-						continue;
-					}
-				}
-			}
-
 			prj = rz_config_get(r->config, "prj.file");
 			bool compress = rz_config_get_b(r->config, "prj.compress");
 			RzProjectErr prj_err = RZ_PROJECT_ERR_SUCCESS;
@@ -1496,6 +1477,21 @@ RZ_API int rz_main_rizin(int argc, const char **argv) {
 					continue;
 				}
 			}
+
+			if (debug) {
+				if (no_question_debug) {
+					if (rz_config_get_i(r->config, "dbg.exitkills") && y_kill_debug) {
+						rz_debug_kill(r->dbg, r->dbg->pid, r->dbg->tid, 9); // KILL
+					}
+				} else {
+					if (rz_config_get_i(r->config, "dbg.exitkills") &&
+						rz_debug_can_kill(r->dbg) &&
+						rz_cons_yesno('y', "Do you want to kill the process? (Y/n)")) {
+						rz_config_set_i(r->config, "scr.confirmquit", false);
+						rz_debug_kill(r->dbg, r->dbg->pid, r->dbg->tid, 9); // KILL
+					}
+				}
+			}
 		} else {
 			// rz_core_project_save (r, prj);
 			if (debug && rz_config_get_i(r->config, "dbg.exitkills")) {