Stop depth stream before destroying registration - fixes #373

piedar · piedar · commit 4f4daa40cd4e · 2014-02-25T01:07:58.000-05:00
Signed-off-by: Benn Snyder &lt;benn.snyder@gmail.com&gt;
diff --git a/src/cameras.c b/src/cameras.c
@@ -1048,7 +1048,6 @@ int freenect_stop_depth(freenect_device *dev)
 		return -1;
 
 	dev->depth.running = 0;
-	freenect_destroy_registration(&(dev->registration));
 	write_register(dev, 0x06, 0x00); // stop depth stream
 
 	res = fnusb_stop_iso(&dev->usb_cam, &dev->depth_isoc);
@@ -1057,6 +1056,7 @@ int freenect_stop_depth(freenect_device *dev)
 		return res;
 	}
 
+	freenect_destroy_registration(&(dev->registration));
 	stream_freebufs(ctx, &dev->depth);
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -1048,7 +1048,6 @@ int freenect_stop_depth(freenect_device *dev)`
`1048`	`1048`	`return -1;`
`1049`	`1049`
`1050`	`1050`	`dev->depth.running = 0;`
`1051`		`- freenect_destroy_registration(&(dev->registration));`
`1052`	`1051`	`write_register(dev, 0x06, 0x00); // stop depth stream`
`1053`	`1052`
`1054`	`1053`	`res = fnusb_stop_iso(&dev->usb_cam, &dev->depth_isoc);`
`@@ -1057,6 +1056,7 @@ int freenect_stop_depth(freenect_device *dev)`
`1057`	`1056`	`return res;`
`1058`	`1057`	`}`
`1059`	`1058`
	`1059`	`+ freenect_destroy_registration(&(dev->registration));`
`1060`	`1060`	`stream_freebufs(ctx, &dev->depth);`
`1061`	`1061`	`return 0;`
`1062`	`1062`	`}`