fix autosave batch prefix interaction (regression)

artisan-roaster-scope · Dec 21, 2022 · 7deb259 · 7deb259
1 parent d559cf7
commit 7deb259
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/artisanlib/main.py b/src/artisanlib/main.py
@@ -31026,9 +31026,9 @@ def fileSave(self,fname,copy=False):
             if not filename:
                 path = QDir()
                 path.setPath(self.getDefaultPath())
-                if aw.qmc.batchcounter > -1 and aw.qmc.roastbatchnr > 0:
+                if aw.qmc.batchcounter > -1 and aw.qmc.roastbatchnr > 0 and self.qmc.autosaveprefix == '':
                     prefix = aw.qmc.batchprefix + str(aw.qmc.roastbatchnr)
-                elif aw.qmc.roastbatchprefix != '':
+                elif aw.qmc.roastbatchprefix != '' and self.qmc.autosaveprefix == '':
                     prefix = aw.qmc.roastbatchprefix
                 else:
                     prefix = self.qmc.autosaveprefix