mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-09 22:58:28 +02:00
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
src/gui/Makefile.am
Origin commit data
------------------
Commit: 6488fbf13a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)
This commit is contained in:
@@ -92,7 +92,7 @@ int CSettingsManager::exec(CMenuTarget* parent, const std::string &actionKey)
|
||||
else if(actionKey == "saveconfig")
|
||||
{
|
||||
fileBrowser.Dir_Mode = true;
|
||||
if (fileBrowser.exec("/var/tuxbox") == true)
|
||||
if (fileBrowser.exec("/media") == true)
|
||||
{
|
||||
std::string fname = "neutrino.conf";
|
||||
CKeyboardInput * sms = new CKeyboardInput(LOCALE_EXTRA_SAVECONFIG, &fname);
|
||||
|
Reference in New Issue
Block a user