CURA-5232 Renaming variable since it was on conflict with a new variable

introduced in 4cabcb3632fe7a2c987e70197767a6a4bf88349b
This commit is contained in:
Diego Prado Gesto 2018-04-17 13:07:15 +02:00
parent 4c75d78f26
commit 2ebf6e8d51

View File

@ -23,9 +23,9 @@ class ChangeLog(Extension, QObject,):
self._changelog_context = None self._changelog_context = None
version_string = Application.getInstance().getVersion() version_string = Application.getInstance().getVersion()
if version_string is not "master": if version_string is not "master":
self._version = Version(version_string) self._current_app_version = Version(version_string)
else: else:
self._version = None self._current_app_version = None
self._change_logs = None self._change_logs = None
Application.getInstance().engineCreatedSignal.connect(self._onEngineCreated) Application.getInstance().engineCreatedSignal.connect(self._onEngineCreated)
@ -76,7 +76,7 @@ class ChangeLog(Extension, QObject,):
self._change_logs[open_version][open_header].append(line) self._change_logs[open_version][open_header].append(line)
def _onEngineCreated(self): def _onEngineCreated(self):
if not self._version: if not self._current_app_version:
return #We're on dev branch. return #We're on dev branch.
if Preferences.getInstance().getValue("general/latest_version_changelog_shown") == "master": if Preferences.getInstance().getValue("general/latest_version_changelog_shown") == "master":
@ -91,7 +91,7 @@ class ChangeLog(Extension, QObject,):
if not Application.getInstance().getGlobalContainerStack(): if not Application.getInstance().getGlobalContainerStack():
return return
if self._version > latest_version_shown: if self._current_app_version > latest_version_shown:
self.showChangelog() self.showChangelog()
def showChangelog(self): def showChangelog(self):