mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

zapit: initialize videodecoder even in failure case

Browse Source 
this allows to tell the user that something bad happened
before crashing


Origin commit data
------------------
Commit: 451ccaae13
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-11 (Sat, 11 May 2013)
This commit is contained in:
Stefan Seyfried
2013-05-11 17:46:04 +02:00
parent 0475a3731d
commit 5e1f97e28f
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/zapit/src/zapit.cpp
View File

@@ -4,7 +4,7 @@
* zapit - d-box2 linux project * zapit - d-box2 linux project
* *
* (C) 2001, 2002 by Philipp Leusmann <faralla@berlios.de> * (C) 2001, 2002 by Philipp Leusmann <faralla@berlios.de>
* (C) 2007-2012 Stefan Seyfried * (C) 2007-2013 Stefan Seyfried
* Copyright (C) 2011 CoolStream International Ltd * Copyright (C) 2011 CoolStream International Ltd
* *
* This program is free software; you can redistribute it and/or modify * 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(); CFEManager::getInstance()->Init();
live_fe = CFEManager::getInstance()->getFE(0); live_fe = CFEManager::getInstance()->getFE(0);
#if 0
if (live_fe == NULL) /* no frontend found? */ if (live_fe == NULL) /* no frontend found? */
return false; return false;
#endif
/* load configuration or set defaults if no configuration file exists */ /* load configuration or set defaults if no configuration file exists */
video_mode = ZapStart_arg->video_mode; video_mode = ZapStart_arg->video_mode;
@@ -2327,6 +2329,8 @@ bool CZapit::Start(Z_start_arg *ZapStart_arg)
#endif #endif
ca = cCA::GetInstance(); ca = cCA::GetInstance();
if (live_fe == NULL) /* no frontend found? */
return false;
//LoadSettings(); //LoadSettings();
//LoadAudioMap(); //LoadAudioMap();