Tools__InlineMessageDialog.st
changeset 12416 1171d0e7a363
parent 11518 0ff0a7132e35
child 12435 1f1faf35be04
child 12462 7466535c9b47
--- a/Tools__InlineMessageDialog.st	Thu Feb 21 15:03:59 2013 +0100
+++ b/Tools__InlineMessageDialog.st	Thu Feb 21 17:30:02 2013 +0100
@@ -318,7 +318,7 @@
 !InlineMessageDialog class methodsFor:'others'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__InlineMessageDialog.st,v 1.7 2012-05-17 15:31:22 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__InlineMessageDialog.st,v 1.8 2013-02-21 16:30:02 vrany Exp $'
 ! !
 
 !InlineMessageDialog methodsFor:'accessing'!
@@ -397,18 +397,24 @@
     "Modified: / 11-04-2012 / 16:24:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+doAbortIfWorking
+    worker notNil ifTrue:[ self doAbort ].
+
+    "Created: / 04-10-2012 / 19:20:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
 doOK
     <resource: #uiCallback>
 
     (worker notNil and:[worker isDead not]) ifTrue:[
-        worker := nil.
+        "/ raise its prio to make it terminate quickly
+        worker priority:(Processor userSchedulingPriority + 1).
         worker terminate.
-        "/ raise its prio to make it terminate quickly
-        worker priority:(Processor userSchedulingPriority + 1)
+        worker := nil.
     ].
     self hide.
 
-    "Modified: / 11-04-2012 / 13:18:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 27-07-2012 / 15:42:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !InlineMessageDialog methodsFor:'adding & removing components'!
@@ -697,6 +703,7 @@
 hide
 
     | myView otherView |
+    builder isNil ifTrue:[ ^ self ].
     myView := self  getMyView.
     otherView := self getOtherView.
 
@@ -712,12 +719,13 @@
         panelHiddenHolder value: true
     ].
     changeLayoutUponShowHide ~~ false ifTrue:[
-        otherView  layout: layout.
+        otherView layout: layout.
     ].
 
     self reset.
 
     "Created: / 29-10-2010 / 11:55:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified (format): / 17-01-2013 / 23:35:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 show
@@ -926,9 +934,10 @@
 !InlineMessageDialog class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__InlineMessageDialog.st,v 1.7 2012-05-17 15:31:22 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__InlineMessageDialog.st,v 1.8 2013-02-21 16:30:02 vrany Exp $'
 !
 
 version_SVN
     ^ '§Id: Tools__InlineMessageDialog.st 7976 2012-04-11 16:14:22Z vranyj1 §'
 ! !
+