Fixed error in DisplayHandler.

cztomczak · cztomczak · commit 7eba35f5df76 · 2012-11-27T21:29:53.000-08:00
Fixed PyGTK and wxpython examples, shutdown is more reliable.
diff --git a/cefpython1/display_handler.pyx b/cefpython1/display_handler.pyx
@@ -81,7 +81,11 @@ cdef public void DisplayHandler_OnStatusMessage(CefRefPtr[CefBrowser] cefBrowser
                                cef_types.cef_handler_statustype_t statusType) except * with gil:
 
 	try:
-		pyBrowser = GetPyBrowserByCefBrowser(cefBrowser)	
+		# Second parameter = ignoreError.
+		# Error happened here once when running wxpython example, pyBrowser was empty.
+		pyBrowser = GetPyBrowserByCefBrowser(cefBrowser, True)
+		if not pyBrowser:
+			return
 		pyText = CefStringToPyString(cefText)
 		handler = pyBrowser.GetClientHandler("OnStatusMessage")
 		if handler:
@@ -177,7 +181,11 @@ cdef public c_bool DisplayHandler_OnTooltip(CefRefPtr[CefBrowser] cefBrowser,
                          CefString& cefText) except * with gil:
 
 	try:
-		pyBrowser = GetPyBrowserByCefBrowser(cefBrowser)	
+		# To be safe, OnStatusMessage() needs it, so this callback probasbly also,
+		# adding ignoreError=True.
+		pyBrowser = GetPyBrowserByCefBrowser(cefBrowser, True)	
+		if not pyBrowser:
+			return
 		pyText = [CefStringToPyString(cefText)] # In/Out
 		handler = pyBrowser.GetClientHandler("OnTooltip")
 		if handler:
diff --git a/cefpython1/windows_example/pygtk_.py b/cefpython1/windows_example/pygtk_.py
@@ -109,7 +109,6 @@ def OnSize(self, widget, sizeAlloc):
 	def OnExit(self, widget, data=None):
 
 		self.exiting = True
-		cefpython.Shutdown()
 		gtk.main_quit()
 
 if __name__ == '__main__':
@@ -124,3 +123,4 @@ def OnExit(self, widget, data=None):
 	gobject.threads_init() # timer for messageloop
 	PyGTKExample()
 	gtk.main()
+	cefpython.Shutdown()
diff --git a/cefpython1/windows_example/pyqt.py b/cefpython1/windows_example/pyqt.py
@@ -110,9 +110,9 @@ def stopTimer(self):
 	app.exec_()
 	app.stopTimer()
 	
-	# Need to destroy QApplication() by assigning None, otherwise Shutdown() fails.
+	# Need to destroy QApplication(), otherwise Shutdown() fails.
 	# Unset main window also just to be safe.
-	mainWindow = None
-	app = None
+	del mainWindow
+	del app
 	
 	cefpython.Shutdown()
diff --git a/cefpython1/windows_example/pyside.py b/cefpython1/windows_example/pyside.py
@@ -128,9 +128,9 @@ def stopTimer(self):
 	app.exec_()
 	app.stopTimer()
 
-	# Need to destroy QApplication() by assigning None, otherwise Shutdown() fails.
+	# Need to destroy QApplication(), otherwise Shutdown() fails.
 	# Unset main window also just to be safe.
-	mainWindow = None
-	app = None
+	del mainWindow
+	del app
 	
 	cefpython.Shutdown()
diff --git a/cefpython1/windows_example/wxpython.py b/cefpython1/windows_example/wxpython.py
@@ -99,5 +99,7 @@ def OnExit(self):
 	print('wx.version=%s' % wx.version())
 	app = MyApp(False)
 	app.MainLoop()
+	# Let wx.App destructor do the cleanup before calling cefpython.Shutdown().
+	del app
 	
 	cefpython.Shutdown()
