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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8bcaeb980d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-22 (Tue, 22 Nov 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-11-22 23:44:23 +01:00
parent 6b0e887585 99b59f1641
commit 3ace1a4c12
15 changed files with 42 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/neutrino.cpp
View File

@@ -3626,7 +3626,7 @@ int CNeutrinoApp::handleMsg(const neutrino_msg_t _msg, neutrino_msg_data_t data)
}
else if (msg == NeutrinoMessages::EVT_POPUP || msg == NeutrinoMessages::EVT_EXTMSG) {
if (mode != mode_scart && mode != mode_standby) {
int timeout = HINTBOX_DEFAULT_TIMEOUT;
int timeout = NO_TIMEOUT;
std::string text = (char*)data;
std::string::size_type pos;