From patchwork Thu May 26 15:58:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: glenvt18 X-Patchwork-Id: 34432 Received: from localhost ([127.0.0.1] helo=www.linuxtv.org) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b5xgN-0006xF-Lt; Thu, 26 May 2016 15:58:47 +0000 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b5xgL-0006x4-Au for vdr@linuxtv.org; Thu, 26 May 2016 15:58:45 +0000 X-tubIT-Incoming-IP: 209.85.217.194 Received: from mail-lb0-f194.google.com ([209.85.217.194]) by mail.tu-berlin.de (exim-4.84_2/mailfrontend-8) with esmtps [TLSv1.2:AES128-GCM-SHA256:128] for id 1b5xgK-0001aQ-jG; Thu, 26 May 2016 17:58:45 +0200 Received: by mail-lb0-f194.google.com with SMTP id sh2so4671878lbb.2 for ; Thu, 26 May 2016 08:58:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=X2wgfo+rMemldl1fLhrO22iZ47/rwbyfRErcjdzx85I=; b=apfb6O+01Ww1Bc0mHUSXZf8OQ00OvnNnJ69n3vNc59e9kvSgnC5I3CAAbpE/mQzv6Y OopQpefHo57HbC55+tShOUhI26xB9289ACov8YqUh3KW+MrQsjmFt+WWNpmXgTNWxccF ONdhpr9LW0oRnUUjXOyLsmARl32cfir+c5QmOluGQmOlM+z64esixd1dqr/5fqopqvjp TPQSkCVx4yyHPdFm1RqQ4LTpx7Uy/G7vLw16d6Pka3GSGAjfibhUhrlZXV6XLxMMzFL/ HLjt7v44ydesQLNU75N/T8o4+YGtiEuLRs7bCJe3Ym+P9tBvUpSmz8ieem95PQUJXXsy l1CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=X2wgfo+rMemldl1fLhrO22iZ47/rwbyfRErcjdzx85I=; b=gdGD4ItGcWnwEcNFCDIjOtemu2do5zoi0HYhC8Ftv9tug/AHLe8rXShH6x/q07JV5H qo+UJjVFfowzFpOvOTEYaXa+r6v8lxsKhr4P07UjePWhRb6ankXcyfg5y3c/dRR/g7hy SpxEbFCvAr5jwR0UxHg+cl/ihCaB353YJ+ADBJrkfzgvHzmT54EX9+mMHsuK+riHGi9f hKcOkBDaO0MaPmSPDjDPtx0zTQwLv3Hb5S29UpSVgfOKFNOghcLUPNUvxt11JRNwBHCf T9rnTEKqF6xdSCYYPkPwHQQ8B1ogyClpORCvj33/IgRvt88J2rZMIT+UX5+jV5dudkgx RQqA== X-Gm-Message-State: ALyK8tJdWRhlukykQ0usZhqXZDMQydlxChchNB+Kc/70MruAi3yYbHF7qt1XxjZIq6mv0g== X-Received: by 10.112.180.198 with SMTP id dq6mr3154435lbc.142.1464278323172; Thu, 26 May 2016 08:58:43 -0700 (PDT) Received: from localhost.localdomain ([185.135.148.114]) by smtp.gmail.com with ESMTPSA id s126sm2456607lfs.41.2016.05.26.08.58.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 26 May 2016 08:58:42 -0700 (PDT) From: glenvt18 To: vdr@linuxtv.org Date: Thu, 26 May 2016 18:58:34 +0300 Message-Id: <1464278314-28653-1-git-send-email-glenvt18@gmail.com> X-Mailer: git-send-email 1.9.1 X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2016.5.26.155416 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' FROM_NAME_ONE_WORD 0.05, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1000_1099 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, LEGITIMATE_NEGATE 0, MULTIPLE_RCPTS_RND 0, NO_CTA_URI_FOUND 0, NO_URI_FOUND 0, NO_URI_HTTPS 0, WEBMAIL_SOURCE 0, __DATE_TZ_RU 0, __DQ_NEG_HEUR 0, __DQ_NEG_IP 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __MIME_TEXT_ONLY 0, __PHISH_SPEAR_STRUCTURE_1 0, __RDNS_GMAIL 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __YOUTUBE_RCVD 0' X-LSpam-Score: 0.8 (/) X-LSpam-Report: No, score=0.8 required=5.0 tests=FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RDNS_NONE=1.274, T_DKIM_INVALID=0.01 autolearn=no autolearn_force=no Subject: [vdr] [PATCH] cDevice::GetDeviceForTransponder(): fix a typo X-BeenThere: vdr@linuxtv.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: VDR Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: VDR Mailing List MIME-Version: 1.0 Errors-To: vdr-bounces@linuxtv.org Sender: "vdr" d->MaySwitchTransponder(Channel) is always false here Please review, Sergey Chernyavskiy. --- device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.c b/device.c index 18867cd..542d120 100644 --- a/device.c +++ b/device.c @@ -342,7 +342,7 @@ cDevice *cDevice::GetDeviceForTransponder(const cChannel *Channel, int Priority) if (d->ProvidesTransponder(Channel)) { if (d->MaySwitchTransponder(Channel)) Device = d; // this device may switch to the transponder without disturbing any receiver or live view - else if (!d->Occupied() && d->MaySwitchTransponder(Channel)) { // MaySwitchTransponder() implicitly calls Occupied() + else if (!d->Occupied()) { // MaySwitchTransponder() implicitly calls Occupied() if (d->Priority() < Priority && (!Device || d->Priority() < Device->Priority())) Device = d; // use this one only if no other with less impact can be found }