From 002629e93f89ccbedf73200047612d8c11834fb8 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Wed, 11 Aug 2010 17:54:52 +0000 Subject: [PATCH] Patch from Leif for fixing segfault if nothing is selected. SVN revision: 51015 --- src/modules/conf_acpibindings/e_int_config_acpibindings.c | 4 ++-- src/modules/conf_acpibindings/e_mod_main.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/conf_acpibindings/e_int_config_acpibindings.c b/src/modules/conf_acpibindings/e_int_config_acpibindings.c index 1de75244c..cd5329627 100644 --- a/src/modules/conf_acpibindings/e_int_config_acpibindings.c +++ b/src/modules/conf_acpibindings/e_int_config_acpibindings.c @@ -47,7 +47,7 @@ e_int_config_acpibindings(E_Container *con, const char *params __UNUSED__) E_Config_Dialog *cfd; E_Config_Dialog_View *v; - if (e_config_dialog_find("E", "advanced/acpi_bindings")) + if ((e_config_dialog_find("E", "advanced/acpi_bindings"))) return NULL; v = E_NEW(E_Config_Dialog_View, 1); @@ -285,7 +285,7 @@ _selected_binding_get(E_Config_Dialog_Data *cfdata) { E_Config_Binding_Acpi *bind; - if (!cfdata) return NULL; + if ((!cfdata) || (!cfdata->bindex)) return NULL; if (!(bind = eina_list_nth(cfdata->bindings, atoi(cfdata->bindex)))) return NULL; return bind; diff --git a/src/modules/conf_acpibindings/e_mod_main.c b/src/modules/conf_acpibindings/e_mod_main.c index 7691f1180..3509d92f0 100644 --- a/src/modules/conf_acpibindings/e_mod_main.c +++ b/src/modules/conf_acpibindings/e_mod_main.c @@ -29,7 +29,7 @@ e_modapi_shutdown(E_Module *m) { E_Config_Dialog *cfd; - if (cfd = e_config_dialog_get("E", "advanced/acpi_bindings")) + if ((cfd = e_config_dialog_get("E", "advanced/acpi_bindings"))) e_object_del(E_OBJECT(cfd)); e_configure_registry_item_del("advanced/acpi_bindings"); e_configure_registry_category_del("advanced");