mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

- neutrino/miscsettings_menu: fix switching online-services

Browse Source 
Conflicts:
	src/neutrino.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2018-01-21 22:02:27 +01:00
committed by Thilo Graf
parent eb74df956f
commit 304c74e79b
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/gui/miscsettings_menu.cpp
View File

@@ -686,30 +686,30 @@ bool CMiscMenue::changeNotify(const neutrino_locale_t OptionName, void * /*data*
#endif #endif
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_TMDB_API_KEY)) 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) if (g_settings.tmdb_enabled)
tmdb_api_key_short = g_settings.tmdb_api_key.substr(0, 8) + "..."; tmdb_api_key_short = g_settings.tmdb_api_key.substr(0, 8) + "...";
else else
tmdb_api_key_short.clear(); 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)) 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) if (g_settings.youtube_enabled)
youtube_dev_id_short = g_settings.youtube_dev_id.substr(0, 8) + "..."; youtube_dev_id_short = g_settings.youtube_dev_id.substr(0, 8) + "...";
else else
youtube_dev_id_short.clear(); 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)) 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) if (g_settings.shoutcast_enabled)
shoutcast_dev_id_short = g_settings.shoutcast_dev_id.substr(0, 8) + "..."; shoutcast_dev_id_short = g_settings.shoutcast_dev_id.substr(0, 8) + "...";
else else
shoutcast_dev_id_short.clear(); shoutcast_dev_id_short.clear();
shoutcast_onoff->setActive(g_settings.shoutcast_enabled); shoutcast_onoff->setActive(check_shoutcast_dev_id());
} }
return ret; return ret;
} }

6
src/neutrino.cpp
View File

@@ -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.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_dev_id = configfile.getString("shoutcast_dev_id","XXXXXXXXXXXXXXXX");
g_settings.shoutcast_enabled = configfile.getInt32("shoutcast_enabled", 1); 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 //Movie-Player
g_settings.movieplayer_repeat_on = configfile.getInt32("movieplayer_repeat_on", CMoviePlayerGui::REPEAT_OFF); 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_dev_id = configfile.getString("youtube_dev_id","XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX");
g_settings.youtube_enabled = configfile.getInt32("youtube_enabled", 1); 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_api_key = configfile.getString("tmdb_api_key","XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX");
g_settings.tmdb_enabled = configfile.getInt32("tmdb_enabled", 1); 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 //Filebrowser
g_settings.filebrowser_showrights = configfile.getInt32("filebrowser_showrights", 1); g_settings.filebrowser_showrights = configfile.getInt32("filebrowser_showrights", 1);