git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix typo
[enigma2.git]
/
lib
/
base
/
console.cpp
diff --git
a/lib/base/console.cpp
b/lib/base/console.cpp
index 635d11450982a1b40d5ea3de89528ce49fdb8197..f6e8763f59c153185e0e55e6724a23fe2f8d15e7 100644
(file)
--- a/
lib/base/console.cpp
+++ b/
lib/base/console.cpp
@@
-200,7
+200,7
@@
int eConsoleAppContainer::execute( const std::string &cmd )
if ( pid == -1 )
return -3;
if ( pid == -1 )
return -3;
-
eDebug("pipe in = %d, out = %d, err = %d", fd[0], fd[1], fd[2]);
+
//
eDebug("pipe in = %d, out = %d, err = %d", fd[0], fd[1], fd[2]);
in = new eSocketNotifier(eApp, fd[0], POLLIN|POLLPRI|POLLHUP );
out = new eSocketNotifier(eApp, fd[1], POLLOUT, false);
in = new eSocketNotifier(eApp, fd[0], POLLIN|POLLPRI|POLLHUP );
out = new eSocketNotifier(eApp, fd[1], POLLOUT, false);
@@
-218,7
+218,7
@@
eConsoleAppContainer::~eConsoleAppContainer()
void eConsoleAppContainer::kill()
{
void eConsoleAppContainer::kill()
{
- if ( killstate != -1 )
+ if ( killstate != -1
&& pid != -1
)
{
eDebug("user kill(SIGKILL) console App");
killstate=-1;
{
eDebug("user kill(SIGKILL) console App");
killstate=-1;
@@
-239,7
+239,7
@@
void eConsoleAppContainer::kill()
void eConsoleAppContainer::sendCtrlC()
{
void eConsoleAppContainer::sendCtrlC()
{
- if ( killstate != -1 )
+ if ( killstate != -1
&& pid != -1
)
{
eDebug("user send SIGINT(Ctrl-C) to console App");
::kill(pid, SIGINT);
{
eDebug("user send SIGINT(Ctrl-C) to console App");
::kill(pid, SIGINT);
@@
-276,6
+276,7
@@
void eConsoleAppContainer::closePipes()
outbuf.pop();
delete [] d.data;
}
outbuf.pop();
delete [] d.data;
}
+ pid = -1;
}
void eConsoleAppContainer::readyRead(int what)
}
void eConsoleAppContainer::readyRead(int what)