From b72a39dd66aeefacd08380f2d5eb1eb40346f16f Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Thu, 27 Jul 2023 10:30:26 +0600 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=B7=D0=B0=D0=BF=D0=BE=D0=BB=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D1=8B?= =?UTF-8?q?=20=D1=83=D1=81=D1=82=D1=80=D0=BE=D0=B9=D1=81=D1=82=D0=B2=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/view_set_disk.c | 20 ++++++++++++++------ source/view_set_disk.h | 1 + 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/source/view_set_disk.c b/source/view_set_disk.c index ac63fcc..1c78fee 100644 --- a/source/view_set_disk.c +++ b/source/view_set_disk.c @@ -144,12 +144,20 @@ void view_device_get_gui_data() { } else { _config = malloc(sizeof(disk_status)); - disk = yon_char_new(gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(obj_view_device_widgets->DeviceCombo))); - _config->device = yon_char_divide_search(disk, " ", -1); - _config->fs = disk; - _config->mount_point = yon_char_new(""); - _config->name = yon_char_new(""); - + disk = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(obj_view_device_widgets->DeviceCombo)); + if (get_device_vec()->vectorList.total > 0) { + for (int index = 0; index < get_device_vec()->vectorList.total; index++) + { + device_config* obj_device_config = (device_config*)get_device_vec()->pfVectorGet(get_device_vec(), index); + if (strstr(disk, obj_device_config->name_disk)) { + _config->device = yon_char_new(obj_device_config->name_disk); + _config->fs = yon_char_new(obj_device_config->file_system); + _config->mount_point = yon_char_new(obj_device_config->mounted); + _config->name = yon_char_new(obj_device_config->type_dick); + } + + } + } } _config->deferring_size = second_size; _config->deferring_file = second_file; diff --git a/source/view_set_disk.h b/source/view_set_disk.h index 1220ae5..ce5f222 100644 --- a/source/view_set_disk.h +++ b/source/view_set_disk.h @@ -12,6 +12,7 @@ #include "../compile/ubl-cmake.h" #include "model/model.h" #include "model/load.h" +#include "model/my_device.h" typedef struct {