Diff between 230e706f802485c3ce68895752bdc62a418f51e3 and db4e3be989913799d1f4207be064a2d81e72b043

Changed Files

File Additions Deletions Status
obexd/src/obex.c +3 -2 modified

Full Patch

diff --git a/obexd/src/obex.c b/obexd/src/obex.c
index d8f4648..938937c 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;