X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a3825f28e9fd321640ecaf782b2983669fb5e743..c7a430797475bebdaf1e638f13bcae7b4026ee73:/lib/dvb_ci/dvbci_appmgr.cpp

diff --git a/lib/dvb_ci/dvbci_appmgr.cpp b/lib/dvb_ci/dvbci_appmgr.cpp
index 7843554d..f8159730 100644
--- a/lib/dvb_ci/dvbci_appmgr.cpp
+++ b/lib/dvb_ci/dvbci_appmgr.cpp
@@ -6,12 +6,12 @@
 eDVBCIApplicationManagerSession::eDVBCIApplicationManagerSession(eDVBCISlot *tslot)
 {
 	slot = tslot;
-	slot->application_manager	= this;
+	slot->setAppManager(this);
 }
 
 eDVBCIApplicationManagerSession::~eDVBCIApplicationManagerSession()
 {
-	slot = 0;
+	slot->setAppManager(NULL);
 }
 
 int eDVBCIApplicationManagerSession::receivedAPDU(const unsigned char *tag,const void *data, int len)
@@ -46,9 +46,10 @@ int eDVBCIApplicationManagerSession::receivedAPDU(const unsigned char *tag,const
 			for (int i = 0; i < dl; ++i)
 				printf("%c", ((unsigned char*)data)[i+6]);
 			printf("\n");
-			
-			eDVBCI_UI::getInstance()->setState(0,2);
-			eDVBCI_UI::getInstance()->setAppName(0,str);
+
+			eDVBCI_UI::getInstance()->setAppName(slot->getSlotID(), str);
+
+			eDVBCI_UI::getInstance()->setState(slot->getSlotID(), 2);
 			break;
 		}
 		default:
@@ -92,5 +93,6 @@ int eDVBCIApplicationManagerSession::startMMI()
 	printf("in appmanager -> startmmi()\n");
 	const unsigned char tag[3]={0x9F, 0x80, 0x22};  // Tenter_menu
 	sendAPDU(tag);
+	return 0;
 }