summaryrefslogtreecommitdiff
path: root/spectro/kleink10.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/kleink10.c
parent509016be676f7915d635fa57144d2a441e3090ca (diff)
parentc0b89ac5bfb90835ef01573267020e42d4fe070c (diff)
Merge new upstream release
Diffstat (limited to 'spectro/kleink10.c')
-rwxr-xr-x[-rw-r--r--]spectro/kleink10.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/spectro/kleink10.c b/spectro/kleink10.c
index d632bdb..461cb28 100644..100755
--- a/spectro/kleink10.c
+++ b/spectro/kleink10.c
@@ -2252,7 +2252,7 @@ char id[CALIDLEN] /* Condition identifier (ie. white reference ID) */
/* Do the appropriate calibration */
if (*calt & inst_calt_emis_offset) {
- if (*calc != inst_calc_man_em_dark) {
+ if ((*calc & inst_calc_cond_mask) != inst_calc_man_em_dark) {
*calc = inst_calc_man_em_dark;
return inst_cal_setup;
}
@@ -2797,7 +2797,7 @@ extern kleink10 *new_kleink10(icoms *icom, instType itype) {
p->del = k10_del;
p->icom = icom;
- p->itype = icom->itype;
+ p->itype = itype;
p->dtech = disptech_unknown;
amutex_init(p->lock);