From 1e4cd8989780647bff07ba2824ef34be7c2a428f Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 24 Mar 2019 17:51:08 +0100 Subject: [PATCH] keybind-setup: use g_settings.backup_dir to save/load keys Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/6aca3dcbfbfae5b3728c96dda1082408e62a644b Author: vanhofen Date: 2019-03-24 (Sun, 24 Mar 2019) Origin message was: ------------------ - keybind-setup: use g_settings.backup_dir to save/load keys ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/keybind_setup.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/keybind_setup.cpp b/src/gui/keybind_setup.cpp index 0138fa54e..885c4240c 100644 --- a/src/gui/keybind_setup.cpp +++ b/src/gui/keybind_setup.cpp @@ -97,7 +97,7 @@ int CKeybindSetup::exec(CMenuTarget* parent, const std::string &actionKey) CFileFilter fileFilter; fileFilter.addFilter("conf"); fileBrowser.Filter = &fileFilter; - if (fileBrowser.exec(CONFIGDIR) == true) { + if (fileBrowser.exec(g_settings.backup_dir.c_str()) == true) { CNeutrinoApp::getInstance()->loadKeys(fileBrowser.getSelectedFile()->Name.c_str()); printf("[neutrino keybind_setup] new keys: %s\n", fileBrowser.getSelectedFile()->Name.c_str()); for (int i = 0; i < KEYBINDS_COUNT; i++){ @@ -109,7 +109,7 @@ int CKeybindSetup::exec(CMenuTarget* parent, const std::string &actionKey) else if(actionKey == "savekeys") { CFileBrowser fileBrowser; fileBrowser.Dir_Mode = true; - if (fileBrowser.exec(CONFIGDIR) == true) { + if (fileBrowser.exec(g_settings.backup_dir.c_str()) == true) { std::string fname = "keys.conf"; CKeyboardInput * sms = new CKeyboardInput(LOCALE_EXTRA_SAVEKEYS, &fname); sms->exec(NULL, "");