From db4e3be989913799d1f4207be064a2d81e72b043 Mon Sep 17 00:00:00 2001 From: Slawomir Bochenski Date: Wed, 5 Oct 2011 16:32:37 +0200 Subject: [PATCH] obexd: Reverse order of calls in os_reset_session This replaces: service->get/put, mime->open, ..., service->reset, mime->close logic, with a more appropriate: service->get/put, mime->open, ..., mime->close, service->reset --- obexd/src/obex.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/obexd/src/obex.c b/obexd/src/obex.c index d8f4648f5..938937c10 100644 --- a/obexd/src/obex.c +++ b/obexd/src/obex.c @@ -284,8 +284,6 @@ static void os_session_mark_aborted(struct obex_session *os) static void os_reset_session(struct obex_session *os) { os_session_mark_aborted(os); - if (os->service && os->service->reset) - os->service->reset(os, os->service_data); if (os->object) { os->driver->set_io_watch(os->object, NULL, NULL); @@ -297,6 +295,9 @@ static void os_reset_session(struct obex_session *os) os->driver->remove(os->path); } + if (os->service && os->service->reset) + os->service->reset(os, os->service_data); + if (os->name) { g_free(os->name); os->name = NULL; -- 2.47.3