From 0e31fd5af73676bfd10ceb16b0fde37763f1e66a Mon Sep 17 00:00:00 2001
From: gixxpunk <thomas.harfmann@gmail.com>
Date: Wed, 8 Jun 2011 18:44:36 +0000
Subject: [PATCH] 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


Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/d6ff5415e809ed7bfd9684fdcf435c09234bf705
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
---
 src/neutrino.cpp | 10 +++++-----
 src/neutrino.h   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 5bc7e64b9..e8f36cb23 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -1626,7 +1626,7 @@ void CNeutrinoApp::CmdParser(int argc, char **argv)
 
 	sections_debug = false;
 	softupdate = false;
-	fromflash = false;
+	//fromflash = false;
 
 	font.name = NULL;
 
@@ -1636,11 +1636,11 @@ void CNeutrinoApp::CmdParser(int argc, char **argv)
 			softupdate = true;
 			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");
 			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]);
 			dprintf(DEBUG_NORMAL, "set debuglevel: %d\n", dl);
 			setDebugLevel(dl);
@@ -1664,7 +1664,7 @@ void CNeutrinoApp::CmdParser(int argc, char **argv)
 				x++;
 		}
 		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");
 			exit(1);
 		}
diff --git a/src/neutrino.h b/src/neutrino.h
index 9ddae133f..b81a70364 100644
--- a/src/neutrino.h
+++ b/src/neutrino.h
@@ -123,7 +123,7 @@ private:
 	int				mode;
 	int				lastMode;
 	bool				softupdate;
-	bool				fromflash;
+//	bool				fromflash;
 	bool 				init_cec_setting;
 	CTimerd::RecordingInfo* nextRecordingInfo;
 	//bool				record_mode;