Skip to content

Commit 3a5e5ca

Browse files
authored
Merge pull request #94 from mwhapples/CleanUp
Fix possible issue with a widget being disposed.
2 parents 2f60278 + 1dc5346 commit 3a5e5ca

1 file changed

Lines changed: 2 additions & 8 deletions

File tree

  • brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/views/style

brailleblaster-core/src/main/java/org/brailleblaster/perspectives/braille/views/style/StylePane.kt

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -360,14 +360,8 @@ class StylePane(parent: Composite, private val m: Manager) : BBEditorView {
360360
private fun setCurrent() {
361361
val pos = widget.caretOffset
362362
val line = widget.getLineAtOffset(pos)
363-
val textView = m.textView
364-
if (line < textView.content.lineCount) {
365-
textView.caretOffset = textView.getOffsetAtLine(line)
366-
}
367-
val brailleView = m.brailleView
368-
if (line < brailleView.content.lineCount) {
369-
brailleView.caretOffset = brailleView.getOffsetAtLine(line)
370-
}
363+
m.textView.takeUnless { it.isDisposed && it.content.lineCount <= line }?.also { it.caretOffset = it.getOffsetAtLine(line) }
364+
m.brailleView.takeUnless { it.isDisposed && it.content.lineCount <= line }?.also { it.caretOffset = it.getOffsetAtLine(line) }
371365
}
372366

373367
private fun updateTextView() {

0 commit comments

Comments
 (0)