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

Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	src/gui/Makefile.am
	src/neutrino.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d42384f0d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-01 (Fri, 01 Jul 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-07-01 15:28:37 +02:00
parent 4c0c75fd67 8da554c0fa
commit 2f8caeb659
17 changed files with 338 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/neutrino.cpp
View File

@@ -47,6 +47,7 @@
#include "global.h"
#include "neutrino.h"
#include "neutrino_menue.h"
#include "version_pseudo.h"
#include <daemonc/remotecontrol.h>
@@ -2305,7 +2306,7 @@ TIMER_STOP("################################## after all #######################
}
delete hintBox;
}
RealRun(personalize.getWidget(0)/**main**/);
RealRun();
ExitRun(true, (cs_get_revision() > 7));
@@ -2395,9 +2396,9 @@ void CNeutrinoApp::screensaver(bool on)
}
}
void CNeutrinoApp::RealRun(CMenuWidget &_mainMenu)
void CNeutrinoApp::RealRun()
{
mainMenu = &_mainMenu;
mainMenu = &personalize.getWidget(MENU_MAIN);
neutrino_msg_t msg;
neutrino_msg_data_t data;