From 5ad67ccfd2ec03729bedbab8c204633095d6f43f Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Tue, 1 Jul 2014 16:42:23 +0900 Subject: [PATCH] fix appmenu shutdown of dbus when it's null - no complaint --- src/modules/appmenu/e_mod_dbus_registrar_server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/appmenu/e_mod_dbus_registrar_server.c b/src/modules/appmenu/e_mod_dbus_registrar_server.c index 2625ec965..2c16e1d98 100644 --- a/src/modules/appmenu/e_mod_dbus_registrar_server.c +++ b/src/modules/appmenu/e_mod_dbus_registrar_server.c @@ -199,7 +199,7 @@ appmenu_dbus_registrar_server_init(E_AppMenu_Context *ctx) void appmenu_dbus_registrar_server_shutdown(E_AppMenu_Context *ctx) { - eldbus_service_interface_unregister(ctx->iface); - eldbus_name_release(ctx->conn, REGISTRAR_BUS, NULL, NULL); + if (ctx->iface) eldbus_service_interface_unregister(ctx->iface); + if (ctx->conn) eldbus_name_release(ctx->conn, REGISTRAR_BUS, NULL, NULL); ctx->iface = NULL; }