[Opensync-commits] r5524 - osynctool/trunk/tools

[<svn...@op...>]

Author: dgollub
Date: Fri Apr  3 23:33:13 2009
New Revision: 5524
URL: http://www.opensync.org/changeset/5524

Log:
Fixed wrong casting in conflict resolution of a list element.

Modified:
   osynctool/trunk/tools/osynctool.c

Modified: osynctool/trunk/tools/osynctool.c
==============================================================================
--- osynctool/trunk/tools/osynctool.c	Fri Apr  3 16:24:48 2009	(r5523)
+++ osynctool/trunk/tools/osynctool.c	Fri Apr  3 23:33:13 2009	(r5524)
@@ -591,9 +591,11 @@
 		case OSYNC_CONFLICT_RESOLUTION_SELECT:
 			printf("Solving conflict\n");
 			
-			change = (OSyncChange *) osync_list_nth(changes, winner);
-				
-			g_assert(change);
+			c = osync_list_nth(changes, winner);
+			osync_assert(c);
+
+			change = (OSyncChange *) c->data;
+
 			if (!osync_engine_mapping_solve(engine, mapping, change, &error))
 				goto error;
 			return;