Changeset 5146


Ignore:
Timestamp:
Mar 16, 2015 12:17:11 AM (9 years ago)
Author:
ldelgass
Message:

merge r5145 from trunk

Location:
branches/1.4
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.4

    • Property svn:mergeinfo changed
      /trunkmerged: 5145
  • branches/1.4/gui/scripts/visviewer.tcl

    r5143 r5146  
    475475        # This can cause us to re-enter SendBytes during the tkwait, which
    476476        # is not safe because the _buffer will be clobbered
    477         blt::busy hold $itk_component(main)
     477        if { [info exists itk_component(main)] } {
     478            blt::busy hold $itk_component(main) -cursor ""
     479        }
    478480        fileevent $_sid writable [itcl::code $this SendHelper]
    479481        tkwait variable ::Rappture::VisViewer::_done($this)
    480         blt::busy release $itk_component(main)
     482        if { [info exists itk_component(main)] } {
     483            blt::busy release $itk_component(main)
     484        }
    481485    }
    482486    set _buffer(out) ""
Note: See TracChangeset for help on using the changeset viewer.