mirror of https://github.com/vitalif/phantomjs
Fix bug where script wouldn't exit properly
parent
82c6735fd0
commit
e93bea5a21
|
@ -40,6 +40,7 @@ class Phantom(QObject):
|
||||||
self.m_verbose = args.verbose
|
self.m_verbose = args.verbose
|
||||||
self.m_page = WebPage(self)
|
self.m_page = WebPage(self)
|
||||||
self.m_returnValue = 0
|
self.m_returnValue = 0
|
||||||
|
self.m_terminated = False
|
||||||
# setup the values from args
|
# setup the values from args
|
||||||
self.m_script = args.script
|
self.m_script = args.script
|
||||||
self.m_scriptFile = args.script_name
|
self.m_scriptFile = args.script_name
|
||||||
|
@ -89,6 +90,7 @@ class Phantom(QObject):
|
||||||
self.m_script = coffee.convert(self.m_script)
|
self.m_script = coffee.convert(self.m_script)
|
||||||
|
|
||||||
self.m_page.mainFrame().evaluateJavaScript(self.m_script)
|
self.m_page.mainFrame().evaluateJavaScript(self.m_script)
|
||||||
|
return not self.m_terminated
|
||||||
|
|
||||||
def printConsoleMessage(self, msg):
|
def printConsoleMessage(self, msg):
|
||||||
print msg
|
print msg
|
||||||
|
@ -118,6 +120,7 @@ class Phantom(QObject):
|
||||||
@pyqtSlot()
|
@pyqtSlot()
|
||||||
@pyqtSlot(int)
|
@pyqtSlot(int)
|
||||||
def exit(self, code=0):
|
def exit(self, code=0):
|
||||||
|
self.m_terminated = True
|
||||||
self.m_returnValue = code
|
self.m_returnValue = code
|
||||||
QApplication.instance().exit(code)
|
QApplication.instance().exit(code)
|
||||||
|
|
||||||
|
|
|
@ -148,8 +148,8 @@ def main():
|
||||||
|
|
||||||
do_action('Main', Bunch(locals()))
|
do_action('Main', Bunch(locals()))
|
||||||
|
|
||||||
phantom.execute()
|
if phantom.execute():
|
||||||
app.exec_()
|
app.exec_()
|
||||||
return phantom.returnValue()
|
return phantom.returnValue()
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue