mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 16:31:05 +02:00
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Origin commit data
------------------
Commit: 2087f6202e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-03 (Sun, 03 Dec 2017)
This commit is contained in:
@@ -430,7 +430,7 @@ int CMoviePlayerGui::exec(CMenuTarget * parent, const std::string & actionKey)
|
||||
moviebrowser->setMode(MB_SHOW_RECORDS);
|
||||
//wakeup_hdd(g_settings.network_nfs_recordingdir.c_str());
|
||||
}
|
||||
#if HAVE_COOL_HARDWARE
|
||||
#if HAVE_COOL_HARDWARE || HAVE_GENERIC_HARDWARE
|
||||
else if (actionKey == "ytplayback") {
|
||||
isMovieBrowser = true;
|
||||
moviebrowser->setMode(MB_SHOW_YT);
|
||||
|
@@ -688,6 +688,7 @@ int CFlashUpdate::exec(CMenuTarget* parent, const std::string &actionKey)
|
||||
c[0] = fgetc(f);
|
||||
printf("[update] Current partition: %s\n", c);
|
||||
}
|
||||
fclose(f);
|
||||
}
|
||||
|
||||
// select partition
|
||||
|
Reference in New Issue
Block a user