mirror of https://github.com/vitalif/phantomjs
Simplify the logic inside Phantom::execute().
We need to make sure we return quickly if terminated is set to false (e.g. in the constructor, if something is wrong).1.2
parent
78856f8d51
commit
75bbbebb89
|
@ -188,9 +188,18 @@ QVariantMap Phantom::defaultPageSettings() const
|
||||||
|
|
||||||
bool Phantom::execute()
|
bool Phantom::execute()
|
||||||
{
|
{
|
||||||
return !m_scriptFile.isEmpty() && //< script filename provided
|
if (m_terminated)
|
||||||
Utils::injectJsInFrame(m_scriptFile, QDir::currentPath(), m_page->mainFrame()) && //< script injected
|
return false;
|
||||||
!m_terminated; //< not terminated
|
|
||||||
|
if (m_scriptFile.isEmpty())
|
||||||
|
return false;
|
||||||
|
|
||||||
|
if (!Utils::injectJsInFrame(m_scriptFile, QDir::currentPath(), m_page->mainFrame())) {
|
||||||
|
m_returnValue = -1;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
int Phantom::returnValue() const
|
int Phantom::returnValue() const
|
||||||
|
|
Loading…
Reference in New Issue