From 2ebf6e8d511a545d8b22ca778734bf796f9f0979 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Tue, 17 Apr 2018 13:07:15 +0200 Subject: [PATCH] CURA-5232 Renaming variable since it was on conflict with a new variable introduced in 4cabcb3632fe7a2c987e70197767a6a4bf88349b --- plugins/ChangeLogPlugin/ChangeLog.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/ChangeLogPlugin/ChangeLog.py b/plugins/ChangeLogPlugin/ChangeLog.py index c31d1337ef..030d854d3f 100644 --- a/plugins/ChangeLogPlugin/ChangeLog.py +++ b/plugins/ChangeLogPlugin/ChangeLog.py @@ -23,9 +23,9 @@ class ChangeLog(Extension, QObject,): self._changelog_context = None version_string = Application.getInstance().getVersion() if version_string is not "master": - self._version = Version(version_string) + self._current_app_version = Version(version_string) else: - self._version = None + self._current_app_version = None self._change_logs = None Application.getInstance().engineCreatedSignal.connect(self._onEngineCreated) @@ -76,7 +76,7 @@ class ChangeLog(Extension, QObject,): self._change_logs[open_version][open_header].append(line) def _onEngineCreated(self): - if not self._version: + if not self._current_app_version: return #We're on dev branch. if Preferences.getInstance().getValue("general/latest_version_changelog_shown") == "master": @@ -91,7 +91,7 @@ class ChangeLog(Extension, QObject,): if not Application.getInstance().getGlobalContainerStack(): return - if self._version > latest_version_shown: + if self._current_app_version > latest_version_shown: self.showChangelog() def showChangelog(self):