Merge 31410d3 into 1af8775

lukaszgo1 · web-flow · commit ca793c64d3b2 · 2019-08-01T20:18:30.000Z
diff --git a/source/core.py b/source/core.py
@@ -1,9 +1,9 @@
 # -*- coding: UTF-8 -*-
-#core.py
-#A part of NonVisual Desktop Access (NVDA)
-#Copyright (C) 2006-2018 NV Access Limited, Aleksey Sadovoy, Christopher Toth, Joseph Lee, Peter Vágner, Derek Riemer, Babbage B.V., Zahari Yurukov
-#This file is covered by the GNU General Public License.
-#See the file COPYING for more details.
+# A part of NonVisual Desktop Access (NVDA)
+# Copyright (C) 2006-2019 NV Access Limited, Aleksey Sadovoy, Christopher Toth, Joseph Lee, Peter Vágner,
+# Derek Riemer, Babbage B.V., Zahari Yurukov, Łukasz Golonka
+# This file is covered by the GNU General Public License.
+# See the file COPYING for more details.
 
 """NVDA core"""
 
@@ -36,6 +36,7 @@ class CallCancelled(Exception):
 import globalVars
 from logHandler import log
 import addonHandler
+import versionInfo
 
 import extensionPoints
 
@@ -229,8 +230,6 @@ def main():
 		languageHandler.setLanguage(lang)
 	except:
 		log.warning("Could not set language to %s"%lang)
-	import versionInfo
-	log.info("NVDA version %s" % versionInfo.version)
 	log.info("Using Windows version %s" % winVersion.winVersionText)
 	log.info("Using Python version %s"%sys.version)
 	log.info("Using comtypes version %s"%comtypes.__version__)
diff --git a/source/nvda.pyw b/source/nvda.pyw
@@ -1,6 +1,7 @@
+# -*- coding: UTF-8 -*-
 #nvda.pyw
 #A part of NonVisual Desktop Access (NVDA)
-#Copyright (C) 2006-2018 NV Access Limited, Aleksey Sadovoy, Babbage B.V., Joseph Lee
+#Copyright (C) 2006-2019 NV Access Limited, Aleksey Sadovoy, Babbage B.V., Joseph Lee, Łukasz Golonka
 #This file is covered by the GNU General Public License.
 #See the file COPYING for more details.
 
@@ -203,8 +204,8 @@ logHandler.initialize()
 logHandler.log.setLevel(logLevel)
 if logLevel is log.DEBUG:
 	log.debug("Provided arguments: {}".format(sys.argv[1:]))
-
-log.info("Starting NVDA")
+import buildVersion
+log.info("Starting NVDA version %s" % buildVersion.version)
 log.debug("Debug level logging enabled")
 if globalVars.appArgs.changeScreenReaderFlag:
 	winUser.setSystemScreenReaderFlag(True)
