瀏覽代碼

gconsole: Only creation and sending of event belongs to condition.

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@55232 15284696-431f-4ddb-bdfa-cd5b030d7da7
Štěpán Turek 12 年之前
父節點
當前提交
c1dc4bc28b
共有 1 個文件被更改,包括 22 次插入26 次删除
  1. 22 26
      gui/wxpython/core/gconsole.py

+ 22 - 26
gui/wxpython/core/gconsole.py

@@ -126,22 +126,20 @@ class CmdThread(threading.Thread):
             requestTime = time.time()
 
             # prepare
-            if not self.receiver:
-                return
-
-            event = wxCmdPrepare(cmd=args[0],
-                                 time=requestTime,
-                                 pid=requestId,
-                                 onPrepare=vars()['onPrepare'],
-                                 userData=vars()['userData'])
+            if self.receiver:
+                event = wxCmdPrepare(cmd=args[0],
+                                     time=requestTime,
+                                     pid=requestId,
+                                     onPrepare=vars()['onPrepare'],
+                                     userData=vars()['userData'])
 
-            wx.PostEvent(self.receiver, event)
+                wx.PostEvent(self.receiver, event)
 
-            # run command
-            event = wxCmdRun(cmd=args[0],
-                             pid=requestId)
+                # run command
+                event = wxCmdRun(cmd=args[0],
+                                 pid=requestId)
 
-            wx.PostEvent(self.receiver, event)
+                wx.PostEvent(self.receiver, event)
 
             time.sleep(.1)
             self.requestCmd = vars()['callable'](*args, **kwds)
@@ -192,19 +190,17 @@ class CmdThread(threading.Thread):
                     self.requestCmdColor = vars()['callable'](*argsColor, **kwds)
                     self.resultQ.put((requestId, self.requestCmdColor.run()))
 
-            if not self.receiver:
-                return
-
-            event = wxCmdDone(cmd=args[0],
-                              aborted=aborted,
-                              returncode=returncode,
-                              time=requestTime,
-                              pid=requestId,
-                              onDone=vars()['onDone'],
-                              userData=vars()['userData'])
-
-            # send event
-            wx.PostEvent(self.receiver, event)
+            if self.receiver:
+                event = wxCmdDone(cmd=args[0],
+                                  aborted=aborted,
+                                  returncode=returncode,
+                                  time=requestTime,
+                                  pid=requestId,
+                                  onDone=vars()['onDone'],
+                                  userData=vars()['userData'])
+
+                # send event
+                wx.PostEvent(self.receiver, event)
 
     def abort(self, abortall=True):
         """!Abort command(s)"""