mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-27 15:32:52 +02:00
Merge remote-tracking branch 'check/cst-next'
Conflicts:
src/daemonc/remotecontrol.cpp
src/gui/luainstance.cpp
src/gui/movieplayer.cpp
src/gui/videosettings.cpp
src/neutrino.cpp
src/system/setting_helpers.cpp
src/zapit/src/zapit.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: d37b3c0f9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-28 (Sun, 28 Dec 2014)
------------------
This commit was generated by Migit
This commit is contained in:
@@ -126,6 +126,7 @@ int my_system(int argc, const char *arg, ...)
|
||||
if (i == argv_max)
|
||||
{
|
||||
fprintf(stderr, "my_system: too many arguments!\n");
|
||||
va_end(args);
|
||||
return -1;
|
||||
}
|
||||
argv[i] = va_arg(args, const char *);
|
||||
|
Reference in New Issue
Block a user