mirror/projectm
3
0
Fork 0
mirror of https://github.com/projectM-visualizer/projectm.git synced 2026-04-27 17:04:44 +00:00
Code Issues Projects Releases Wiki Activity

Fixed URL detection in PresetFactory

Browse Source
This commit is contained in:
Kai Blaschke
2022-12-04 21:51:03 +01:00
parent 9ea98bf01e
commit 53ea059ec1
1 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/libprojectM/PresetFactory.cpp
View File

@ -2,28 +2,19 @@
const std::string PresetFactory::IDLE_PRESET_PROTOCOL("idle");
std::string PresetFactory::Protocol(const std::string& url, std::string& path) {
std::string PresetFactory::Protocol(const std::string& url, std::string& path)
{
auto pos = url.find("://");
#ifdef __APPLE__
// NOTE: Brian changed this from url.find_first_of to url.find, since presumably we want to find the first occurence of
// :// and not the first occurence of any colon or forward slash. At least that fixed a bug in the Mac OS X build.
std::size_t pos = url.find("://");
#else
std::size_t pos = url.find_first_of("://");
#endif
if (pos == std::string::npos)
if (pos == std::string::npos)
{
path = url;
return std::string();
return {};
}
else
{
path = url.substr(pos + 3, url.length());
path = url.substr(pos + 3, url.length());
#ifdef DEBUG
std::cout << "[PresetFactory] Filename is URL: " << url << std::endl;
std::cout << "[PresetFactory] Filename is URL: " << url << std::endl;
#endif
return url.substr(0, pos);
}
return url.substr(0, pos);
}