summaryrefslogtreecommitdiff
path: root/spectro/i1pro.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-08-23 12:22:51 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-08-23 12:22:51 +0200
commitbc3604d9b226ac475a104cd8ae2ca2d1d4a27984 (patch)
treee796661f371a94a50edfdc693388bb911b253dfd /spectro/i1pro.c
parent509016be676f7915d635fa57144d2a441e3090ca (diff)
parentc0b89ac5bfb90835ef01573267020e42d4fe070c (diff)
Merge new upstream release
Diffstat (limited to 'spectro/i1pro.c')
-rwxr-xr-x[-rw-r--r--]spectro/i1pro.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/spectro/i1pro.c b/spectro/i1pro.c
index cc2d7f2..96335cc 100644..100755
--- a/spectro/i1pro.c
+++ b/spectro/i1pro.c
@@ -726,7 +726,7 @@ i1pro_get_set_opt(inst *pp, inst_opt_type m, ...)
i1pro_set_noinitcalib(p, 0, 0);
return inst_ok;
- } if (m == inst_opt_noinitcalib) {
+ } else if (m == inst_opt_noinitcalib) {
va_list args;
int losecs = 0;
@@ -839,7 +839,7 @@ extern i1pro *new_i1pro(icoms *icom, instType itype) {
p->del = i1pro_del;
p->icom = icom;
- p->itype = icom->itype;
+ p->itype = itype;
i1pro_determine_capabilities(p);