Move exit dialog to kill() (#597)

printrun/pronterface.py

@@ -325,14 +325,13 @@ class PronterWindow(MainWindow, pronsole.pronsole):
         event.Skip()
 
     def on_exit(self, event):
-        # prevent unwanted exit
-        if(self.p.printing | self.p.paused):
-            dlg = wx.MessageDialog(self, _("Print in progress ! Are you really sure you want to quit ?"), _("Exit"), wx.YES_NO | wx.ICON_WARNING)
-            if dlg.ShowModal() == wx.ID_NO:
-                return
         self.Close()
 
     def kill(self, e):
+        if self.p.printing or self.p.paused:
+            dlg = wx.MessageDialog(self, _("Print in progress ! Are you really sure you want to quit ?"), _("Exit"), wx.YES_NO | wx.ICON_WARNING)
+            if dlg.ShowModal() == wx.ID_NO:
+                return
         pronsole.pronsole.kill(self)
         global pronterface_quitting
         pronterface_quitting = True