From c0b89ac5bfb90835ef01573267020e42d4fe070c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 23 Aug 2015 12:17:05 +0200 Subject: Imported Upstream version 1.8.0 --- spectro/kleink10.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 spectro/kleink10.c (limited to 'spectro/kleink10.c') diff --git a/spectro/kleink10.c b/spectro/kleink10.c old mode 100644 new mode 100755 index d632bdb..461cb28 --- 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); -- cgit v1.2.3