summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--camlibs/sierra/ChangeLog5
-rw-r--r--camlibs/sierra/sierra.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/camlibs/sierra/ChangeLog b/camlibs/sierra/ChangeLog
index 054987893..b0d113d3d 100644
--- a/camlibs/sierra/ChangeLog
+++ b/camlibs/sierra/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-26 Lutz Müller <lutz@users.sourceforge.net>
+
+ * sierra.c (camera_start): Forgot a gp_port_get_settings before
+ checking settings.serial.speed. Shouldn't affect anything though...
+
2002-04-17 Lutz Müller <lutz@users.sourceforge.net>
Patch by Ilya Konstantinov <anonymous1@future.shiny.co.il>:
diff --git a/camlibs/sierra/sierra.c b/camlibs/sierra/sierra.c
index 36f6fc0ee..2d887f8ce 100644
--- a/camlibs/sierra/sierra.c
+++ b/camlibs/sierra/sierra.c
@@ -381,6 +381,7 @@ camera_start (Camera *camera, GPContext *context)
CHECK (sierra_ping (camera, context));
/* If needed, change speed. */
+ CHECK (gp_port_get_settings (camera->port, &settings));
if (camera->pl->speed != settings.serial.speed)
CHECK (sierra_set_speed (camera, camera->pl->speed,
context));