Merge pull request #194 from rahulp13/master

Verilator support and fixes crash issues

2 files changed, 27 insertions, 9 deletions

diff --git a/src/projManagement/Kicad.py b/src/projManagement/Kicad.py
index 8f25b732..8c92c06b 100644
--- a/src/projManagement/Kicad.py
+++ b/src/projManagement/Kicad.py
@@ -96,11 +96,11 @@ class Kicad:
             self.msg.setWindowTitle("Error Message")
             self.msg.showMessage(
                 'Please select the project first. You can either ' +
-                'create new project or open existing project')
+                'create new project or open an existing project')
             self.msg.exec_()
             self.obj_appconfig.print_warning(
                 'Please select the project first. You can either ' +
-                'create new project or open existing project')
+                'create new project or open an existing project')
 
     '''
     # Commenting as it is no longer needed as PCB and Layout will open from
@@ -133,10 +133,10 @@ class Kicad:
             self.msg.setModal(True)
             self.msg.setWindowTitle("Error Message")
             self.msg.showMessage('Please select the project first. You can'
-            + 'either create new project or open existing project')
+            + 'either create new project or open an existing project')
             self.msg.exec_()
             self.obj_appconfig.print_warning('Please select the project'
-            + 'first. You can either create new project or open existing'
+            + 'first. You can either create new project or open an existing'
             + 'project')
 
     def openLayout(self):
@@ -166,10 +166,10 @@ class Kicad:
             self.msg.setModal(True)
             self.msg.setWindowTitle("Error Message")
             self.msg.showMessage('Please select the project first. You can'
-            + 'either create new project or open existing project')
+            + 'either create new project or open an existing project')
             self.msg.exec_()
             self.obj_appconfig.print_warning('Please select the project'
-            + 'first. You can either create new project or open existing'
+            + 'first. You can either create new project or open an existing'
             + 'project')
     '''
 
@@ -226,8 +226,8 @@ class Kicad:
             self.msg.setWindowTitle("Error Message")
             self.msg.showMessage(
                 'Please select the project first. You can either ' +
-                'create new project or open existing project')
+                'create new project or open an existing project')
             self.msg.exec_()
             self.obj_appconfig.print_warning(
                 'Please select the project first. You can either ' +
-                'create new project or open existing project')
+                'create new project or open an existing project')
diff --git a/src/projManagement/Worker.py b/src/projManagement/Worker.py
index 970bfccd..6ff1e361 100644
--- a/src/projManagement/Worker.py
+++ b/src/projManagement/Worker.py
@@ -16,7 +16,7 @@
 #      REVISION: Sunday 16 August 2020
 # =========================================================================
 
-from PyQt5 import QtCore
+from PyQt5 import QtCore, QtWidgets
 import subprocess
 from configuration.Appconfig import Appconfig
 
@@ -97,7 +97,25 @@ class WorkerThread(QtCore.QThread):
         """
 
         procThread = Appconfig()
+        projDir = procThread.current_project["ProjectName"]
+
+        if (projDir is None) and ('nghdl' not in command):
+            msg = QtWidgets.QErrorMessage()
+            msg.setModal(True)
+            msg.setWindowTitle("Error Message")
+            msg.showMessage(
+                'Please select the project first. You can either ' +
+                'create a new project or open an existing project.'
+            )
+            msg.exec_()
+
+            return
+
         proc = subprocess.Popen(command.split())
+
+        if 'nghdl' in command:
+            return
+
         self.my_workers.append(proc)
         procThread.procThread_list.append(proc)
         procThread.proc_dict[procThread.current_project['ProjectName']].append(