From 5152d80ac48ac45e4d1a7f767da0df2cb499815a Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" <1619840+vkbo@users.noreply.github.com> Date: Mon, 28 Sep 2020 23:39:43 +0200 Subject: [PATCH] Fixed a bug in project open where old projects were converted before asking permision --- nw/core/project.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/nw/core/project.py b/nw/core/project.py index f7c18bdd..f914bfb5 100644 --- a/nw/core/project.py +++ b/nw/core/project.py @@ -390,16 +390,11 @@ class NWProject(): # Check for Old Legacy Data # ========================= - errList = [] + legacyList = [] # Cleanup is done later for projItem in listdir(self.projPath): logger.verbose("Project contains: %s" % projItem) if projItem.startswith("data_"): - errList = self._legacyDataFolder(projItem, errList) - - if errList: - self.makeAlert(errList, nwAlert.ERROR) - - self._deprecatedFiles() + legacyList.append(projItem) # Project Lock # ============ @@ -611,6 +606,17 @@ class NWProject(): self.optState.loadSettings() + # Sort out old file locations + if legacyList: + errList = [] + for projItem in legacyList: + errList = self._legacyDataFolder(projItem, errList) + if errList: + self.makeAlert(errList, nwAlert.ERROR) + + # Clean up old files + self._deprecatedFiles() + # Update recent projects self.mainConf.updateRecentCache(self.projPath, self.projName, self.lastWCount, time()) self.mainConf.saveRecentCache()