Changeset 9131


Ignore:
Timestamp:
12/19/13 22:34:08 (9 years ago)
Author:
theparasol
Message:
  • commit 9093 reverted partly changes to preferlocalcards -> fixed!
Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/module-webif.c

    r9130 r9131  
    336336    if(cfg.waitforcards == 1)  { tpl_addVar(vars, TPLADD, "WAITFORCARDSCHECKED", "selected"); }
    337337    tpl_printf(vars, TPLADD, "EXTRADELAY", "%d", cfg.waitforcards_extra_delay);
    338     if(cfg.preferlocalcards == 1)  { tpl_addVar(vars, TPLADD, "PREFERLOCALCARDSCHECKED", "selected"); }
     338    if(cfg.preferlocalcards == 1)
     339    {
     340        tpl_addVar(vars, TPLADD, "PREFERCACHEEX", "selected");
     341    }
     342    else if(cfg.preferlocalcards == 2)
     343    {
     344        tpl_addVar(vars, TPLADD, "PREFERLOCALCARDS", "selected");
     345    }
    339346
    340347    if(cfg.c35_suppresscmd08)
  • trunk/oscam-ecm.c

    r9126 r9131  
    11741174                // Cache-Exchange
    11751175                if((ea->status & REQUEST_SENT) ||
    1176                         (ea->status & (READER_CACHEEX | READER_ACTIVE)) != (READER_CACHEEX | READER_ACTIVE))
     1176                        (ea->status & (READER_CACHEEX | READER_ACTIVE)) != (READER_CACHEEX | READER_ACTIVE) || cfg.preferlocalcards==2)
    11771177                    { continue; }
    11781178                break;
Note: See TracChangeset for help on using the changeset viewer.