From b4bf1e2f774a79c958b82a2d8e40e3f7d8ecacfc Mon Sep 17 00:00:00 2001 From: jrl Date: Fri, 10 Nov 2006 07:25:49 +0000 Subject: [PATCH] 2006-11-10 James Livingston * plugins/generic-player/rb-nokia770-source.c: (hal_udi_is_nokia770): * plugins/generic-player/rb-psp-source.c: (hal_udi_is_psp): * sources/rb-ipod-source.c: (hal_udi_is_ipod): don't shutdown the HAL context if it wasn't inited. Fixes #372824 --- ChangeLog | 8 ++++++++ plugins/generic-player/rb-nokia770-source.c | 5 ++++- plugins/generic-player/rb-psp-source.c | 5 ++++- sources/rb-ipod-source.c | 5 ++++- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1526034a..7702b598 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-11-10 James Livingston + + * plugins/generic-player/rb-nokia770-source.c: + (hal_udi_is_nokia770): + * plugins/generic-player/rb-psp-source.c: (hal_udi_is_psp): + * sources/rb-ipod-source.c: (hal_udi_is_ipod): don't shutdown the HAL + context if it wasn't inited. Fixes #372824 + 2006-11-09 Jonathan Matthew * plugins/daap/rb-daap-plugin.h: diff --git a/plugins/generic-player/rb-nokia770-source.c b/plugins/generic-player/rb-nokia770-source.c index 8d4c3dcd..06896b89 100644 --- a/plugins/generic-player/rb-nokia770-source.c +++ b/plugins/generic-player/rb-nokia770-source.c @@ -129,6 +129,7 @@ hal_udi_is_nokia770 (const char *udi) char *parent_name; gboolean result; DBusError error; + gboolean inited = FALSE; result = FALSE; dbus_error_init (&error); @@ -150,6 +151,7 @@ hal_udi_is_nokia770 (const char *udi) if (!libhal_ctx_init (ctx, &error) || dbus_error_is_set (&error)) goto end; + inited = TRUE; parent_udi = libhal_device_get_property_string (ctx, udi, "info.parent", &error); if (parent_udi == NULL || dbus_error_is_set (&error)) @@ -188,7 +190,8 @@ end: } if (ctx) { - libhal_ctx_shutdown (ctx, &error); + if (inited) + libhal_ctx_shutdown (ctx, &error); libhal_ctx_free(ctx); } diff --git a/plugins/generic-player/rb-psp-source.c b/plugins/generic-player/rb-psp-source.c index ae4775ac..915dd766 100644 --- a/plugins/generic-player/rb-psp-source.c +++ b/plugins/generic-player/rb-psp-source.c @@ -200,6 +200,7 @@ hal_udi_is_psp (const char *udi) char *parent_name; gboolean result; DBusError error; + gboolean inited = FALSE; result = FALSE; dbus_error_init (&error); @@ -221,6 +222,7 @@ hal_udi_is_psp (const char *udi) if (!libhal_ctx_init (ctx, &error) || dbus_error_is_set (&error)) goto end; + inited = TRUE; parent_udi = libhal_device_get_property_string (ctx, udi, "info.parent", &error); if (parent_udi == NULL || dbus_error_is_set (&error)) @@ -246,7 +248,8 @@ end: } if (ctx) { - libhal_ctx_shutdown (ctx, &error); + if (inited) + libhal_ctx_shutdown (ctx, &error); libhal_ctx_free(ctx); } diff --git a/sources/rb-ipod-source.c b/sources/rb-ipod-source.c index 6e083eaa..258e6491 100644 --- a/sources/rb-ipod-source.c +++ b/sources/rb-ipod-source.c @@ -662,6 +662,7 @@ hal_udi_is_ipod (const char *udi) char *parent_name; gboolean result; DBusError error; + gboolean inited = FALSE; result = FALSE; dbus_error_init (&error); @@ -686,6 +687,7 @@ hal_udi_is_ipod (const char *udi) if (!libhal_ctx_init (ctx, &error) || dbus_error_is_set (&error)) goto end; + inited = TRUE; parent_udi = libhal_device_get_property_string (ctx, udi, "info.parent", &error); if (parent_udi == NULL || dbus_error_is_set (&error)) @@ -752,7 +754,8 @@ end: } if (ctx) { - libhal_ctx_shutdown (ctx, &error); + if (inited) + libhal_ctx_shutdown (ctx, &error); libhal_ctx_free(ctx); } -- 2.11.4.GIT