Mercurial Repositories > eric / changeset

--- a/Project/Project.py	Sat Sep 01 10:24:02 2018 +0200
+++ b/Project/Project.py	Sat Sep 01 10:39:08 2018 +0200
@@ -2617,6 +2617,7 @@
                         os.path.basename(tslist[0]).split('_')[0],
                         os.path.splitext(tslist[0])[1]))
             else:
+                mainscriptname = ""
                 pattern, ok = QInputDialog.getText(
                     None,
                     self.tr("Translation Pattern"),
@@ -2648,7 +2649,7 @@
                     for qm in qmlist:
                         self.pdata["TRANSLATIONS"].append(qm)
                         self.projectLanguageAdded.emit(qm)
-            if not self.pdata["MAINSCRIPT"]:
+            if not self.pdata["MAINSCRIPT"] and bool(mainscriptname):
                 if self.pdata["PROGLANGUAGE"] in \
                         ["Python", "Python2", "Python3"]:
                     self.pdata["MAINSCRIPT"] = '{0}.py'.format(mainscriptname)

--- a/VCS/ProjectHelper.py	Sat Sep 01 10:24:02 2018 +0200
+++ b/VCS/ProjectHelper.py	Sat Sep 01 10:39:08 2018 +0200
@@ -240,7 +240,7 @@
                     vcores = False
                 if vcores:
                     from .CommandOptionsDialog import VcsCommandOptionsDialog
-                    codlg = VcsCommandOptionsDialog(self.project.vcs)
+                    codlg = VcsCommandOptionsDialog(vcs)
                     if codlg.exec_() == QDialog.Accepted:
                         vcs.vcsSetOptions(codlg.getOptions())