Исправил замечания по задаче #15

pull/17/head
Igor Belitskiy 3 years ago
parent 728d996b67
commit 8ab1e8a7cf

@ -619,11 +619,14 @@ string MainWindow::start_cmd(string user_cmd) {
int len_termunal_cmd = sizeof(termunal_cmd)/sizeof(*termunal_cmd); int len_termunal_cmd = sizeof(termunal_cmd)/sizeof(*termunal_cmd);
for (int index = 0; index<len_termunal_cmd; index++) { for (int index = 0; index<len_termunal_cmd; index++) {
name_terminal_arr = termunal_cmd[index]; name_terminal_arr = termunal_cmd[index];
str_remove(name_terminal_arr, " -e "); size_t index_term = name_terminal_arr.find(" ");
str_remove(name_terminal_arr, " -x "); if (index_term != string::npos) {
if (name_terminal == name_terminal_arr) { name_terminal_arr =name_terminal_arr.substr(0, index_term);
str_cmd_terminal = termunal_cmd[index]; if (name_terminal == name_terminal_arr) {
str_cmd_terminal = termunal_cmd[index];
}
} }
} }
} }
else{ else{
@ -784,11 +787,13 @@ void MainWindow::pars_dir_terminal() {
int len_termunal_cmd = sizeof(termunal_cmd)/sizeof(*termunal_cmd); int len_termunal_cmd = sizeof(termunal_cmd)/sizeof(*termunal_cmd);
for (int index = 0; index < len_termunal_cmd; ++index) { for (int index = 0; index < len_termunal_cmd; ++index) {
name_terminal = termunal_cmd[index]; name_terminal = termunal_cmd[index];
str_remove(name_terminal, " -e "); size_t index_term = name_terminal.find(" ");
str_remove(name_terminal, " -x "); if (index_term != string::npos){
if (name_terminal == file_name) { name_terminal = name_terminal.substr(0, index_term);
cmbTerminal->append(name_terminal); if (name_terminal == file_name) {
cmbTerminal->set_active_text(name_terminal); cmbTerminal->append(name_terminal);
cmbTerminal->set_active_text(name_terminal);
}
} }
} }
} }

Loading…
Cancel
Save