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

src/neutrino.cpp: fix rebase error

Browse Source
This commit is contained in:
Thilo Graf
2018-10-03 11:36:41 +02:00
parent 6df51e513a
commit 9eae4ddecd
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/neutrino.cpp
View File

@@ -2475,7 +2475,7 @@ TIMER_START();
g_videoSettings = new CVideoSettings; g_videoSettings = new CVideoSettings;
g_videoSettings->setVideoSettings(); g_videoSettings->setVideoSettings();
frameBuffer->showFrame(LOGODIR "/logo.jpg"); // show start logo
bool startlogo = frameBuffer->showFrame("logo.jpg"); bool startlogo = frameBuffer->showFrame("logo.jpg");
g_RCInput = new CRCInput(); g_RCInput = new CRCInput();