From 44841ef5d06a6c7d0e22491901afc067228f7e64 Mon Sep 17 00:00:00 2001 From: Burt P Date: Fri, 9 Aug 2019 21:21:46 -0500 Subject: bug fix for ids file search Signed-off-by: Burt P --- hardinfo/udisks2_util.c | 2 +- modules/devices/arm/arm_data.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hardinfo/udisks2_util.c b/hardinfo/udisks2_util.c index 0687b14a..8aa54f72 100644 --- a/hardinfo/udisks2_util.c +++ b/hardinfo/udisks2_util.c @@ -30,7 +30,7 @@ void find_sdcard_ids_file() { }; int n; for(n = 0; file_search_order[n]; n++) { - if (!access(file_search_order[n], R_OK)) + if (!sdcard_ids_file && !access(file_search_order[n], R_OK)) sdcard_ids_file = file_search_order[n]; else g_free(file_search_order[n]); diff --git a/modules/devices/arm/arm_data.c b/modules/devices/arm/arm_data.c index 179771dc..4ca77be9 100644 --- a/modules/devices/arm/arm_data.c +++ b/modules/devices/arm/arm_data.c @@ -133,7 +133,7 @@ void find_arm_ids_file() { }; int n; for(n = 0; file_search_order[n]; n++) { - if (!access(file_search_order[n], R_OK)) + if (!arm_ids_file && !access(file_search_order[n], R_OK)) arm_ids_file = (gchar*) auto_free_on_exit( file_search_order[n] ); else g_free(file_search_order[n]); -- cgit v1.2.3