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 {