Merge remote-tracking branch 'cst-next'

Origin commit data
------------------
Branch: ni/coolstream
Commit: b53fbaf327
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-08 (Fri, 08 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2016-01-08 19:52:41 +01:00
25 changed files with 194 additions and 130 deletions

View File

@@ -402,7 +402,8 @@ void CPlugins::startScriptPlugin(int number)
chmod(script, 0755);
if (plugin_list[number].shellwindow)
{
CShellWindow(script, CShellWindow::VERBOSE | CShellWindow::ACKNOWLEDGE);
int res = 0;
CShellWindow (script, CShellWindow::VERBOSE | CShellWindow::ACKNOWLEDGE, &res);
scriptOutput = "";
}
else