From 1ee1cf2f2ba769e63f6345d1849fe8dcbe41763c Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Tue, 20 Mar 2012 11:20:13 +0400 Subject: [PATCH] src/neutrino.cpp: fix conflict, remove old code Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/a343a64883ddc2862ceb2d2415b5ca03c0ae05a5 Author: [CST] Focus Date: 2012-03-20 (Tue, 20 Mar 2012) --- src/neutrino.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index aa051c5b4..cdcda8e37 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -1776,8 +1776,6 @@ TIMER_START(); //init video settings g_videoSettings = new CVideoSettings; g_videoSettings->setVideoSettings(); - if(display_language_selection) - videoDecoder->ShowPicture(DATADIR "/neutrino/icons/start.jpg"); g_RCInput = new CRCInput();