diff --git a/platform/platform_qt.cpp b/platform/platform_qt.cpp index dc0b649fa1..59cf7d8b2b 100644 --- a/platform/platform_qt.cpp +++ b/platform/platform_qt.cpp @@ -26,7 +26,6 @@ bool Platform::GetFileSize(string const & file, uint64_t & size) const void Platform::GetFilesInDir(string const & directory, string const & mask, FilesList & outFiles) const { - outFiles.clear(); QDir dir(directory.c_str(), mask.c_str(), QDir::Unsorted, QDir::Files | QDir::Readable | QDir::Dirs | QDir::NoDotAndDotDot); int const count = dir.count(); @@ -55,10 +54,7 @@ void Platform::GetFontNames(FilesList & res) const GetFilesInDir(WritableDir(), "*.ttf", res); res.resize(unique(res.begin(), res.end()) - res.begin()); sort(res.begin(), res.end()); -#ifdef DEBUG - for (size_t i = 0; i < res.size(); ++i) - LOG(LDEBUG, ("Found font:", res[i])); -#endif + CHECK(!res.empty(), ("Can't find any valid font in", ResourcesDir(), WritableDir())); } int Platform::MaxTilesCount() const diff --git a/platform/platform_tests/platform_test.cpp b/platform/platform_tests/platform_test.cpp index c66cac2c3a..5b38d7c472 100644 --- a/platform/platform_tests/platform_test.cpp +++ b/platform/platform_tests/platform_test.cpp @@ -68,6 +68,8 @@ UNIT_TEST(GetFilesInDir) pl.GetFilesInDir(pl.WritableDir(), "*" DATA_FILE_EXTENSION, files); TEST_GREATER(files.size(), 0, ("/data/ folder should contain some data files")); + files.clear(); + pl.GetFilesInDir(pl.WritableDir(), "asdnonexistentfile.dsa", files); TEST_EQUAL(files.size(), 0, ()); }