Browse Source

Fix folder name extraction functions

It should return empty string if there is no parent folder.
adaptive-webui-19844
Vladimir Golovnev (Glassez) 4 years ago
parent
commit
79048812e9
No known key found for this signature in database
GPG Key ID: 52A2C7DEE2DFA6F7
  1. 2
      src/base/utils/fs.cpp
  2. 2
      src/webui/www/private/scripts/filesystem.js

2
src/base/utils/fs.cpp

@ -95,7 +95,7 @@ QString Utils::Fs::folderName(const QString &filePath)
const QString path = toUniformPath(filePath); const QString path = toUniformPath(filePath);
const int slashIndex = path.lastIndexOf('/'); const int slashIndex = path.lastIndexOf('/');
if (slashIndex == -1) if (slashIndex == -1)
return path; return {};
return path.left(slashIndex); return path.left(slashIndex);
} }

2
src/webui/www/private/scripts/filesystem.js

@ -70,7 +70,7 @@ window.qBittorrent.Filesystem = (function() {
const folderName = function(filepath) { const folderName = function(filepath) {
const slashIndex = filepath.lastIndexOf(PathSeparator); const slashIndex = filepath.lastIndexOf(PathSeparator);
if (slashIndex === -1) if (slashIndex === -1)
return filepath; return '';
return filepath.substring(0, slashIndex); return filepath.substring(0, slashIndex);
}; };

Loading…
Cancel
Save