From 304c74e79bab86d81a451cd032c34afcb2dbaa6f Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Sun, 21 Jan 2018 22:02:27 +0100 Subject: [PATCH] - neutrino/miscsettings_menu: fix switching online-services Conflicts: src/neutrino.cpp Signed-off-by: Thilo Graf --- src/gui/miscsettings_menu.cpp | 12 ++++++------ src/neutrino.cpp | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/gui/miscsettings_menu.cpp b/src/gui/miscsettings_menu.cpp index a7601ab0b..4092793ef 100644 --- a/src/gui/miscsettings_menu.cpp +++ b/src/gui/miscsettings_menu.cpp @@ -686,30 +686,30 @@ bool CMiscMenue::changeNotify(const neutrino_locale_t OptionName, void * /*data* #endif else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_TMDB_API_KEY)) { - g_settings.tmdb_enabled = check_tmdb_api_key(); + g_settings.tmdb_enabled = g_settings.tmdb_enabled && check_tmdb_api_key(); if (g_settings.tmdb_enabled) tmdb_api_key_short = g_settings.tmdb_api_key.substr(0, 8) + "..."; else tmdb_api_key_short.clear(); - tmdb_onoff->setActive(g_settings.tmdb_enabled); + tmdb_onoff->setActive(check_tmdb_api_key()); } else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_YOUTUBE_DEV_ID)) { - g_settings.youtube_enabled = check_youtube_dev_id(); + g_settings.youtube_enabled = g_settings.youtube_enabled && check_youtube_dev_id(); if (g_settings.youtube_enabled) youtube_dev_id_short = g_settings.youtube_dev_id.substr(0, 8) + "..."; else youtube_dev_id_short.clear(); - youtube_onoff->setActive(g_settings.youtube_enabled); + youtube_onoff->setActive(check_youtube_dev_id()); } else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_SHOUTCAST_DEV_ID)) { - g_settings.shoutcast_enabled = check_shoutcast_dev_id(); + g_settings.shoutcast_enabled = g_settings.shoutcast_enabled && check_shoutcast_dev_id(); if (g_settings.shoutcast_enabled) shoutcast_dev_id_short = g_settings.shoutcast_dev_id.substr(0, 8) + "..."; else shoutcast_dev_id_short.clear(); - shoutcast_onoff->setActive(g_settings.shoutcast_enabled); + shoutcast_onoff->setActive(check_shoutcast_dev_id()); } return ret; } diff --git a/src/neutrino.cpp b/src/neutrino.cpp index d0d1272b9..1d82f1a63 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -865,16 +865,16 @@ int CNeutrinoApp::loadSetup(const char * fname) g_settings.audioplayer_enable_sc_metadata = configfile.getInt32("audioplayer_enable_sc_metadata",1); g_settings.shoutcast_dev_id = configfile.getString("shoutcast_dev_id","XXXXXXXXXXXXXXXX"); g_settings.shoutcast_enabled = configfile.getInt32("shoutcast_enabled", 1); - g_settings.shoutcast_enabled = check_shoutcast_dev_id(); + g_settings.shoutcast_enabled = g_settings.shoutcast_enabled && check_shoutcast_dev_id(); //Movie-Player g_settings.movieplayer_repeat_on = configfile.getInt32("movieplayer_repeat_on", CMoviePlayerGui::REPEAT_OFF); g_settings.youtube_dev_id = configfile.getString("youtube_dev_id","XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); g_settings.youtube_enabled = configfile.getInt32("youtube_enabled", 1); - g_settings.youtube_enabled = check_youtube_dev_id(); + g_settings.youtube_enabled = g_settings.youtube_enabled && check_youtube_dev_id(); g_settings.tmdb_api_key = configfile.getString("tmdb_api_key","XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"); g_settings.tmdb_enabled = configfile.getInt32("tmdb_enabled", 1); - g_settings.tmdb_enabled = check_tmdb_api_key(); + g_settings.tmdb_enabled = g_settings.tmdb_enabled && check_tmdb_api_key(); //Filebrowser g_settings.filebrowser_showrights = configfile.getInt32("filebrowser_showrights", 1);