mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 01:11:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

neutrino-tell-the-user-if-no-frontend-is-found1.patch from neutrino-mp

Browse Source
This commit is contained in:
satbaby
2013-01-13 21:52:37 +01:00
parent be0eb77373
commit d0ea4ad62e
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/neutrino.cpp
View File

@@ -1777,8 +1777,7 @@ TIMER_START();
ZapStart_arg.volume = g_settings.current_volume; ZapStart_arg.volume = g_settings.current_volume;
/* create decoders, read channels */ /* create decoders, read channels */
CZapit::getInstance()->Start(&ZapStart_arg); bool zapit_init = CZapit::getInstance()->Start(&ZapStart_arg);
// init audio settings // init audio settings
audioDecoder->SetSRS(g_settings.srs_enable, g_settings.srs_nmgr_enable, g_settings.srs_algo, g_settings.srs_ref_volume); audioDecoder->SetSRS(g_settings.srs_enable, g_settings.srs_nmgr_enable, g_settings.srs_algo, g_settings.srs_ref_volume);
//audioDecoder->setVolume(g_settings.current_volume, g_settings.current_volume); //audioDecoder->setVolume(g_settings.current_volume, g_settings.current_volume);
@@ -1796,6 +1795,12 @@ TIMER_START();
g_RCInput = new CRCInput(); g_RCInput = new CRCInput();
/* later on, we'll crash anyway, so tell about it. */
if (! zapit_init)
ShowMsgUTF(LOCALE_MESSAGEBOX_INFO,
"Zapit initialization failed.\nThis is a fatal error, sorry.",
CMessageBox::mbrBack, CMessageBox::mbBack);
InitZapitClient(); InitZapitClient();
g_Zapit->setStandby(false); g_Zapit->setStandby(false);

4
src/zapit/src/zapit.cpp
View File

@@ -2023,6 +2023,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 (live_fe == NULL) /* no frontend found? */
return false;
/* 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;
current_volume = ZapStart_arg->volume; current_volume = ZapStart_arg->volume;