From b639c7f3f0ec6c4c206926a6dd58d90fb75ff542 Mon Sep 17 00:00:00 2001
From: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm>
Date: Sat, 7 Dec 2019 22:27:36 +0000
Subject: [PATCH] Fix old Rust woes

---
 src/layout.rs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/layout.rs b/src/layout.rs
index 4262c82c..b1d654fd 100644
--- a/src/layout.rs
+++ b/src/layout.rs
@@ -312,9 +312,13 @@ pub mod c {
                 Point { x: x_widget, y: y_widget }
             );
 
-            let view = layout.get_current_view();
-            if let Some(place) = view.find_button_by_position(point) {
-                let mut state = place.button.state.clone();
+            let state = {
+                let view = layout.get_current_view();
+                view.find_button_by_position(point)
+                    .map(|place| place.button.state.clone())
+            };
+            
+            if let Some(mut state) = state {
                 layout.press_key(
                     &VirtualKeyboard(virtual_keyboard),
                     &mut state,
@@ -322,7 +326,7 @@ pub mod c {
                 );
                 // maybe TODO: draw on the display buffer here
                 drawing::queue_redraw(ui_keyboard);
-            }
+            };
         }
 
         // FIXME: this will work funny