From 5e1f97e28ffb64d45281a6e6c08459597d20d82f Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Sat, 11 May 2013 17:46:04 +0200 Subject: [PATCH] zapit: initialize videodecoder even in failure case this allows to tell the user that something bad happened before crashing Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/451ccaae13b63d9273496948d6f4d787b23c8860 Author: Stefan Seyfried Date: 2013-05-11 (Sat, 11 May 2013) --- src/zapit/src/zapit.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/zapit/src/zapit.cpp b/src/zapit/src/zapit.cpp index d60b7afad..acb21edb7 100644 --- a/src/zapit/src/zapit.cpp +++ b/src/zapit/src/zapit.cpp @@ -4,7 +4,7 @@ * zapit - d-box2 linux project * * (C) 2001, 2002 by Philipp Leusmann - * (C) 2007-2012 Stefan Seyfried + * (C) 2007-2013 Stefan Seyfried * Copyright (C) 2011 CoolStream International Ltd * * This program is free software; you can redistribute it and/or modify @@ -2266,8 +2266,10 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg) CFEManager::getInstance()->Init(); live_fe = CFEManager::getInstance()->getFE(0); +#if 0 if (live_fe == NULL) /* no frontend found? */ return false; +#endif /* load configuration or set defaults if no configuration file exists */ video_mode = ZapStart_arg->video_mode; @@ -2327,6 +2329,8 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg) #endif ca = cCA::GetInstance(); + if (live_fe == NULL) /* no frontend found? */ + return false; //LoadSettings(); //LoadAudioMap();