From 8ab1e8a7cf80535d26422f6b9f2d49e17eb0ca59 Mon Sep 17 00:00:00 2001
From: Igor Belitskiy <goga.belitskiy.00@mail.eu>
Date: Fri, 17 Mar 2023 11:00:25 +0600
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=B7=D0=B0=D0=BC=D0=B5=D1=87=D0=B0=D0=BD=D0=B8=D1=8F?=
 =?UTF-8?q?=20=D0=BF=D0=BE=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87=D0=B5=20#15?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/ublexec.cc | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

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