mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 07:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino: fix a segfault and remove unused enable-flash option

Browse Source 
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1529 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Branch: ni/coolstream
Commit: d6ff5415e8
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2011-06-08 (Wed, 08 Jun 2011)

Origin message was:
------------------
- neutrino: fix a segfault and remove unused enable-flash option

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1529 e54a6e83-5905-42d5-8d5c-058d10e6a962


------------------
This commit was generated by Migit
This commit is contained in:
gixxpunk
2011-06-08 18:44:36 +00:00
parent 259ecb26e0
commit 0e31fd5af7
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/neutrino.cpp
View File

@@ -1626,7 +1626,7 @@ void CNeutrinoApp::CmdParser(int argc, char **argv)
sections_debug = false; sections_debug = false;
softupdate = false; softupdate = false;
fromflash = false; //fromflash = false;
font.name = NULL; font.name = NULL;
@@ -1636,11 +1636,11 @@ void CNeutrinoApp::CmdParser(int argc, char **argv)
softupdate = true; softupdate = true;
allow_flash = 1; allow_flash = 1;
} }
else if ((!strcmp(argv[x], "-f")) || (!strcmp(argv[x], "--enable-flash"))) { /*else if ((!strcmp(argv[x], "-f")) || (!strcmp(argv[x], "--enable-flash"))) {
dprintf(DEBUG_NORMAL, "enable flash\n"); dprintf(DEBUG_NORMAL, "enable flash\n");
fromflash = true; fromflash = true;
} }*/
else if ((!strcmp(argv[x], "-v")) || (!strcmp(argv[x], "--verbose"))) { else if (((!strcmp(argv[x], "-v")) || (!strcmp(argv[x], "--verbose"))) && (x+1 < argc)) {
int dl = atoi(argv[x+ 1]); int dl = atoi(argv[x+ 1]);
dprintf(DEBUG_NORMAL, "set debuglevel: %d\n", dl); dprintf(DEBUG_NORMAL, "set debuglevel: %d\n", dl);
setDebugLevel(dl); setDebugLevel(dl);
@@ -1664,7 +1664,7 @@ void CNeutrinoApp::CmdParser(int argc, char **argv)
x++; x++;
} }
else { else {
dprintf(DEBUG_NORMAL, "Usage: neutrino [-u | --enable-update] [-f | --enable-flash] " dprintf(DEBUG_NORMAL, "Usage: neutrino [-u | --enable-update] "
"[-v | --verbose 0..3]\n"); "[-v | --verbose 0..3]\n");
exit(1); exit(1);
} }

2
src/neutrino.h
View File

@@ -123,7 +123,7 @@ private:
int mode; int mode;
int lastMode; int lastMode;
bool softupdate; bool softupdate;
bool fromflash; // bool fromflash;
bool init_cec_setting; bool init_cec_setting;
CTimerd::RecordingInfo* nextRecordingInfo; CTimerd::RecordingInfo* nextRecordingInfo;
//bool record_mode; //bool record_mode;