From 04b6bb24272d488bf055812cee5f597b6b7c7aa4 Mon Sep 17 00:00:00 2001
From: James Teh <jamie@jantrid.net>
Date: Thu, 1 Mar 2012 17:08:51 +1000
Subject: [PATCH] updateCheck: There is now a single instance of
 AutoUpdateChecker which is used for automatic checks. It is managed by
 initialize() and terminate().

---
 source/updateCheck.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/source/updateCheck.py b/source/updateCheck.py
index d48a3a4b7..00a4cd591 100644
--- a/source/updateCheck.py
+++ b/source/updateCheck.py
@@ -32,6 +32,10 @@ state = {
 	"dontRemindVersion": None,
 }
 
+#: The single instance of L{AutoUpdateChecker} if automatic update checking is enabled,
+#: C{None} if it is disabled.
+autoChecker = None
+
 def checkForUpdate(auto=False):
 	"""Check for an updated version of NVDA.
 	This will block, so it generally shouldn't be called from the main thread.
@@ -91,6 +95,8 @@ class UpdateChecker(object):
 		if info:
 			state["dontRemindVersion"] = info["version"]
 		state["lastCheck"] = time.time()
+		if autoChecker:
+			autoChecker.setNextCheck()
 
 	def _error(self):
 		wx.CallAfter(gui.messageBox,
@@ -124,7 +130,6 @@ class AutoUpdateChecker(UpdateChecker):
 		self.setNextCheck(isRetry=True)
 
 	def _result(self, info):
-		self.setNextCheck()
 		if not info:
 			return
 		if info["version"] == state["dontRemindVersion"]:
@@ -182,3 +187,12 @@ class UpdateResultDialog(wx.Dialog):
 	def onLaterButton(self, evt):
 		state["dontRemindVersion"] = None
 		self.Close()
+
+def initialize():
+	global autoChecker
+	# TODO: Make configurable.
+	autoChecker = AutoUpdateChecker()
+
+def terminate():
+	global autoChecker
+	autoChecker = None
-- 
2.11.0