spacecruft
/
celestia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix failure if an incorrect URL is pasted 

Closes: #637
pull/708/head
Hleb Valoshka 2020-03-05 17:56:49 +03:00
parent 5c3ab1d1b9
commit 7daef79d2a
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/celestia/url.cpp
View File

@ -167,21 +167,28 @@ Url::Url()
Url::Url(const std::string& str, CelestiaCore *core):
urlStr(str),
appCore(core),
nbBodies(-1),
pauseState(false),
timeSource(UseUrlTime),
version(2)
{
std::string::size_type pos, endPrevious;
std::vector<Selection> bodies;
Simulation *sim = appCore->getSimulation();
std::map<std::string, std::string> params = parseUrlParams(urlStr);
if (urlStr.substr(0, 6) != "cel://")
{
urlStr = "";
return;
}
std::map<std::string, std::string> params = parseUrlParams(urlStr);
if (params.empty())
{
urlStr = "";
return;
}
std::string::size_type pos, endPrevious;
std::vector<Selection> bodies;
Simulation *sim = appCore->getSimulation();
// Version labelling of cel URLs was only added in Celestia 1.5, cel URL
// version 2. Assume any URL without a version is version 1.
if (params["ver"] != "")