Changeset 9131

Timestamp:

12/19/13 22:34:08 (10 years ago)

Author:

theparasol

Message:

• commit 9093 reverted partly changes to preferlocalcards -> fixed!

Location:

trunk

Files:

• module-webif.c (modified) (1 diff)
• oscam-ecm.c (modified) (1 diff)

trunk/module-webif.c

@@ -336 +336 @@
     if(cfg.waitforcards == 1)  { tpl_addVar(vars, TPLADD, "WAITFORCARDSCHECKED", "selected"); }
     tpl_printf(vars, TPLADD, "EXTRADELAY", "%d", cfg.waitforcards_extra_delay);
-    if(cfg.preferlocalcards == 1)  { tpl_addVar(vars, TPLADD, "PREFERLOCALCARDSCHECKED", "selected"); }
+    if(cfg.preferlocalcards == 1)
+    {
+        tpl_addVar(vars, TPLADD, "PREFERCACHEEX", "selected");
+    }
+    else if(cfg.preferlocalcards == 2)
+    {
+        tpl_addVar(vars, TPLADD, "PREFERLOCALCARDS", "selected");
+    }
 
     if(cfg.c35_suppresscmd08)

trunk/oscam-ecm.c

@@ -1174 +1174 @@
                 // Cache-Exchange
                 if((ea->status & REQUEST_SENT) ||
-                        (ea->status & (READER_CACHEEX | READER_ACTIVE)) != (READER_CACHEEX | READER_ACTIVE))
+                        (ea->status & (READER_CACHEEX | READER_ACTIVE)) != (READER_CACHEEX | READER_ACTIVE) || cfg.preferlocalcards==2)
                     { continue; }
                 break;