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

Merge branch 'master' into dvbsi++

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 91163cbd47
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-02-15 (Wed, 15 Feb 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2012-02-15 13:54:15 +04:00
parent 3a9440cb5f c80bd561bd
commit f0b9d2dd43
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gui/movieplayer.cpp
View File

@@ -360,6 +360,11 @@ bool CMoviePlayerGui::SelectFile()
file_name = full_name;
printf("CMoviePlayerGui::SelectFile: full_name [%s] file_name [%s]\n", full_name.c_str(), file_name.c_str());
}
//store last multiformat play dir
if( (sizeof(g_settings.network_nfs_moviedir)) > Path_local.size() && (strcmp(g_settings.network_nfs_moviedir,Path_local.c_str()) != 0)){
strcpy(g_settings.network_nfs_moviedir,Path_local.c_str());
}
return ret;
}

2
src/neutrino_menue.cpp
View File

@@ -211,7 +211,7 @@ void CNeutrinoApp::InitMenuMain()
personalize.addItem(MENU_MAIN, new CMenuForwarder(LOCALE_CI_SETTINGS, true, NULL, g_CamHandler), &g_settings.personalize[SNeutrinoSettings::P_MAIN_CISETTINGS]);
#ifdef TEST_MENU
personalize.addItem(MENU_MAIN, new CMenuForwarderNonLocalized("Test menu", true, NULL, new CTestMenu(), CPersonalizeGui::PERSONALIZE_SHOW_NO));
personalize.addItem(MENU_MAIN, new CMenuForwarderNonLocalized("Test menu", true, NULL, new CTestMenu()), NULL, false, CPersonalizeGui::PERSONALIZE_SHOW_NO);
#endif
}