vitalif
/
phantomjs
mirror of https://github.com/vitalif/phantomjs
1
0
Fork 0
Code Issues Releases Wiki Activity

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
Ariya Hidayat 2011-06-17 18:04:20 -07:00
parent 78856f8d51
commit 75bbbebb89
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/phantom.cpp
View File

@ -188,9 +188,18 @@ QVariantMap Phantom::defaultPageSettings() const
bool Phantom::execute()
{
return !m_scriptFile.isEmpty() && //< script filename provided
Utils::injectJsInFrame(m_scriptFile, QDir::currentPath(), m_page->mainFrame()) && //< script injected
!m_terminated; //< not terminated
if (m_terminated)
return false;
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