diff options
| -rw-r--r-- | language/Dutch/strings.xml | 2 | ||||
| -rw-r--r-- | language/English/strings.xml | 2 | ||||
| -rw-r--r-- | xbmc/GUIWindowVideoBase.cpp | 22 |
3 files changed, 18 insertions, 8 deletions
diff --git a/language/Dutch/strings.xml b/language/Dutch/strings.xml index 5df4070b91..14996c7ff2 100644 --- a/language/Dutch/strings.xml +++ b/language/Dutch/strings.xml @@ -1724,6 +1724,8 @@ <string id="20443">Wilt u info voor alles verversen</string> <string id="20444">items binnen dit pad?</string> <string id="20445">Fanart</string> + <string id="20446">Lokaal opgeslagen informatie gevonden.</string> + <string id="20447">Negeren en verversen van internet?</string> <string id="21330">Verborgen bestanden en mappen weergeven</string> <string id="21331">TuxBox-client</string> diff --git a/language/English/strings.xml b/language/English/strings.xml index 93be0c3023..f6cf08452a 100644 --- a/language/English/strings.xml +++ b/language/English/strings.xml @@ -1857,6 +1857,8 @@ <string id="20443">Do you want to refresh info for all</string> <string id="20444">items within this path?</string> <string id="20445">Fanart</string> + <string id="20446">Locally stored information found.</string> + <string id="20447">Ignore and refresh from internet?</string> <string id="20448">Could not download information</string> <string id="20449">Server is most likely unavailable.</string> <string id="20450">Would you like to continue scanning?</string> diff --git a/xbmc/GUIWindowVideoBase.cpp b/xbmc/GUIWindowVideoBase.cpp index 9c1cec39eb..75c583f5f4 100644 --- a/xbmc/GUIWindowVideoBase.cpp +++ b/xbmc/GUIWindowVideoBase.cpp @@ -527,14 +527,14 @@ bool CGUIWindowVideoBase::ShowIMDB(CFileItem *item, const SScraperInfo& info2) } bool ignoreNfo(false); - CNfoFile::NFOResult result = scanner.CheckForNFOFile(item,settings.parent_name_root,info,scrUrl); - if (result == CNfoFile::ERROR_NFO) + CNfoFile::NFOResult nfoResult = scanner.CheckForNFOFile(item,settings.parent_name_root,info,scrUrl); + if (nfoResult == CNfoFile::ERROR_NFO) ignoreNfo = true; else - if (result != CNfoFile::NO_NFO) + if (nfoResult != CNfoFile::NO_NFO) { hasDetails = true; - if (result == CNfoFile::URL_NFO || result == CNfoFile::COMBINED_NFO) + if (nfoResult == CNfoFile::URL_NFO || nfoResult == CNfoFile::COMBINED_NFO) scanner.m_IMDB.SetScraperInfo(info); } @@ -724,11 +724,17 @@ bool CGUIWindowVideoBase::ShowIMDB(CFileItem *item, const SScraperInfo& info2) needsRefresh = pDlgInfo->NeedRefresh(); if (needsRefresh) { - ignoreNfo = true; - info = info2; - hasDetails = false; bHasInfo = true; - scrUrl.Clear(); + if (nfoResult == CNfoFile::URL_NFO || nfoResult == CNfoFile::COMBINED_NFO || nfoResult == CNfoFile::FULL_NFO) + { + if (CGUIDialogYesNo::ShowAndGetInput(13346,20446,20447,20022)) + { + hasDetails = false; + ignoreNfo = true; + scrUrl.Clear(); + info = info2; + } + } } listNeedsUpdating = true; } |