diff options
| author | fuzzard <fuzzard@users.noreply.github.com> | 2020-09-30 12:06:49 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-30 12:06:49 +1000 |
| commit | 9366c0cdee596ce8f53ef3ec439941ab31cb146a (patch) | |
| tree | 43db83238136f4116c622511e121e393523f7d8b | |
| parent | 1c2f4b4479eba0a6816a372a9535642505b350f0 (diff) | |
| parent | 725d50317b6a474752f8542e7c67c44920020979 (diff) | |
Merge pull request #18471 from fuzzard/fixup_screenshot
[screenshot] fix screenshot after PR #18468
| -rw-r--r-- | xbmc/Util.cpp | 10 | ||||
| -rw-r--r-- | xbmc/interfaces/builtins/GUIBuiltins.cpp | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/xbmc/Util.cpp b/xbmc/Util.cpp index fbb5e16c74..2886a20446 100644 --- a/xbmc/Util.cpp +++ b/xbmc/Util.cpp @@ -706,11 +706,15 @@ int64_t CUtil::ToInt64(uint32_t high, uint32_t low) return n; } +/*! + \brief Finds next unused filename that matches padded int format identifier provided + \param[in] fn_template filename template consisting of a padded int format identifier (eg screenshot%03d) + \param[in] max maximum number to search for avaialble name + \return "" on failure, string next available name matching format identifier on success +*/ + std::string CUtil::GetNextFilename(const std::string &fn_template, int max) { - if (fn_template.find("%03d") == std::string::npos) - return ""; - std::string searchPath = URIUtils::GetDirectory(fn_template); std::string mask = URIUtils::GetExtension(fn_template); std::string name = StringUtils::Format(fn_template.c_str(), 0); diff --git a/xbmc/interfaces/builtins/GUIBuiltins.cpp b/xbmc/interfaces/builtins/GUIBuiltins.cpp index e09543b0c2..49caeb03ab 100644 --- a/xbmc/interfaces/builtins/GUIBuiltins.cpp +++ b/xbmc/interfaces/builtins/GUIBuiltins.cpp @@ -304,7 +304,7 @@ static int Screenshot(const std::vector<std::string>& params) { if (XFILE::CDirectory::Exists(strSaveToPath)) { - std::string file = CUtil::GetNextFilename(URIUtils::AddFileToFolder(strSaveToPath, "screenshot%03d.png"), 999); + std::string file = CUtil::GetNextFilename(URIUtils::AddFileToFolder(strSaveToPath, "screenshot%05d.png"), 65535); if (!file.empty()) { |