Better check on open and close project

Thiago Franco de Moraes
1 parent 7733f91d
Showing 3 changed files with 9 additions and 6 deletions Show diff stats
invesalius/control.py
invesalius/gui/frame.py
invesalius/session.py
@@ -155,7 +155,8 @@ class Controller():
         # Open project
         filepath = dialog.ShowOpenProjectDialog()
         if filepath:
-            self.CloseProject()
+            if session.IsOpen():
+                self.CloseProject()
             self.OpenProject(filepath)
     def ShowDialogSaveProject(self, saveas=False):
@@ -195,7 +196,6 @@ class Controller():
                     Publisher.sendMessage("Enable state project", False)
                     Publisher.sendMessage('Set project name')
                     Publisher.sendMessage("Stop Config Recording")
-                    Publisher.sendMessage("Exit")
                 elif answer == 1:
                     self.ShowDialogSaveProject()
                     utils.debug("Save changes and close")
@@ -203,7 +203,6 @@ class Controller():
                     Publisher.sendMessage("Enable state project", False)
                     Publisher.sendMessage('Set project name')
                     Publisher.sendMessage("Stop Config Recording")
-                    Publisher.sendMessage("Exit")
                 elif answer == -1:
                     utils.debug("Cancel")
             else:
@@ -211,11 +210,9 @@ class Controller():
                 Publisher.sendMessage("Enable state project", False)
                 Publisher.sendMessage('Set project name')
                 Publisher.sendMessage("Stop Config Recording")
-                Publisher.sendMessage("Exit")
         else:
             Publisher.sendMessage('Stop Config Recording')
-            Publisher.sendMessage('Exit')
 ###########################
@@ -234,7 +231,8 @@ class Controller():
                 answer = dialog.SaveChangesDialog2(filename)
                 if answer:
                     self.ShowDialogSaveProject()
-            self.CloseProject()
+            if session.IsOpen():
+                self.CloseProject()
             self.OpenProject(filepath)
         else:
             dialog.InexistentPath(filepath)
@@ -353,6 +353,7 @@ class Frame(wx.Frame):
         Close all project data.
         """
         Publisher.sendMessage('Close Project')
+        Publisher.sendMessage('Exit')
     def OnMenuClick(self, evt):
         """
@@ -70,6 +70,10 @@ class Session(object):
         self.rendering = 0
         self.WriteSessionFile()
+    def IsOpen(self):
+        import constants as const
+        return self.project_status != const.PROJ_CLOSE
+
     def SaveConfigFileBackup(self):
         path = os.path.join(self.homedir ,
                             '.invesalius', 'config.cfg')
	@@ -353,6 +353,7 @@ class Frame(wx.Frame):		@@ -353,6 +353,7 @@ class Frame(wx.Frame):
353	Close all project data.	353	Close all project data.
354	"""	354	"""
355	Publisher.sendMessage('Close Project')	355	Publisher.sendMessage('Close Project')
		356	+ Publisher.sendMessage('Exit')
356		357
357	def OnMenuClick(self, evt):	358	def OnMenuClick(self, evt):
358	"""	359	"""