From 20c7f5e0fd3f8f9f2721a0632f38f9b3f9d2b6ad Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Fri, 18 May 2018 21:33:43 +0200 Subject: [PATCH] src/neutrino.cpp: fix possible compile error missing variable Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/f9553665781e1f56b4e7c88359fa45488025b6f0 Author: Thilo Graf Date: 2018-05-18 (Fri, 18 May 2018) ------------------ This commit was generated by Migit --- src/neutrino.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index bfd568a6e..b3f1016be 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -946,7 +946,7 @@ int CNeutrinoApp::loadSetup(const char * fname) ///youtube g_settings.youtube_dev_id = YT_DEV_KEY; #if ENABLE_YOUTUBE_KEY_MANAGE - g_settings.youtube_dev_id = configfile.getString("youtube_dev_id", yt_api_key.empty() ? "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" : g_settings.youtube_dev_id); + g_settings.youtube_dev_id = configfile.getString("youtube_dev_id", g_settings.youtube_dev_id .empty() ? "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" : g_settings.youtube_dev_id); #endif g_settings.youtube_enabled = configfile.getInt32("youtube_enabled", 1); g_settings.youtube_enabled = g_settings.youtube_enabled && CApiKey::check_youtube_dev_id(); @@ -954,7 +954,7 @@ int CNeutrinoApp::loadSetup(const char * fname) ///tmdb g_settings.tmdb_api_key = TMDB_DEV_KEY; #if ENABLE_TMDB_KEY_MANAGE - g_settings.tmdb_api_key = configfile.getString("tmdb_api_key", tmdb_api_key.empty() ? "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" : g_settings.tmdb_api_key); + g_settings.tmdb_api_key = configfile.getString("tmdb_api_key", g_settings.tmdb_api_key.empty() ? "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" : g_settings.tmdb_api_key); #endif g_settings.tmdb_enabled = configfile.getInt32("tmdb_enabled", 1); g_settings.tmdb_enabled = g_settings.tmdb_enabled && CApiKey::check_tmdb_api_key(); @@ -962,7 +962,7 @@ int CNeutrinoApp::loadSetup(const char * fname) ///omdb g_settings.omdb_api_key = OMDB_API_KEY; #if ENABLE_OMDB_KEY_MANAGE - g_settings.omdb_api_key = configfile.getString("omdb_api_key", omdb_api_key.empty() ? "XXXXXXXX" : g_settings.omdb_api_key; + g_settings.omdb_api_key = configfile.getString("omdb_api_key", g_settings.omdb_api_key.empty() ? "XXXXXXXX" : g_settings.omdb_api_key); #endif g_settings.omdb_enabled = configfile.getInt32("omdb_enabled", 1); g_settings.omdb_enabled = g_settings.omdb_enabled && CApiKey::check_omdb_api_key(); @@ -970,7 +970,7 @@ int CNeutrinoApp::loadSetup(const char * fname) ///shoutcast g_settings.shoutcast_dev_id = SHOUTCAST_DEV_KEY; #if ENABLE_SHOUTCAST_KEY_MANAGE - g_settings.shoutcast_dev_id = configfile.getString("shoutcast_dev_id", sc_api_key.empty() ? "XXXXXXXXXXXXXXXX" : g_settings.shoutcast_dev_id); + g_settings.shoutcast_dev_id = configfile.getString("shoutcast_dev_id", g_settings.shoutcast_dev_id.empty() ? "XXXXXXXXXXXXXXXX" : g_settings.shoutcast_dev_id); #endif g_settings.shoutcast_enabled = configfile.getInt32("shoutcast_enabled", 1); g_settings.shoutcast_enabled = g_settings.shoutcast_enabled && CApiKey::check_shoutcast_dev_id();