The CAM enquiry menu now aborts if Menu is pressed

This commit is contained in:
Klaus Schmidinger
2005-10-03 12:58:22 +02:00
parent 876ad5d5f6
commit 5956f7eeec
3 changed files with 16 additions and 5 deletions

9
menu.c
View File

@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: menu.c 1.373 2005/10/03 12:24:34 kls Exp $
* $Id: menu.c 1.374 2005/10/03 12:53:51 kls Exp $
*/
#include "menu.h"
@@ -1386,7 +1386,7 @@ cMenuCamEnquiry::cMenuCamEnquiry(cCiEnquiry *CiEnquiry)
cMenuCamEnquiry::~cMenuCamEnquiry()
{
if (!replied)
ciEnquiry->Cancel();
ciEnquiry->Abort();
free(input);
delete ciEnquiry;
}
@@ -1414,6 +1414,11 @@ eOSState cMenuCamEnquiry::ProcessKey(eKeys Key)
default: break;
}
}
else if (state == osBack) {
ciEnquiry->Cancel();
replied = true;
return osEnd;
}
return state;
}