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

Merge branch 'master' into pu/mp

Browse Source 
Conflicts:
	acinclude.m4
This commit is contained in:
svenhoefer
2017-03-22 12:16:01 +01:00
parent d2f02371e8 e3920273bf
commit b1ba85c8c1
14 changed files with 197 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/neutrino.cpp
View File

@@ -2168,10 +2168,6 @@ TIMER_START();
g_RCInput = new CRCInput();
/* later on, we'll crash anyway, so tell about it. */
if (! zapit_init)
DisplayErrorMessage("Zapit initialization failed. This is a fatal error, sorry.");
InitZapitClient();
g_Zapit->setStandby(false);
@@ -2231,6 +2227,10 @@ TIMER_START();
g_CamHandler = new CCAMMenuHandler();
g_CamHandler->init();
/* later on, we'll crash anyway, so tell about it. */
if (! zapit_init)
DisplayErrorMessage("Zapit initialization failed. This is a fatal error, sorry.");
#ifndef ASSUME_MDEV
mkdir("/media/sda1", 0755);
mkdir("/media/sdb1", 0755);