1 files changed, 3 insertions, 8 deletions
diff --git a/main.ml b/main.ml
index 393d4fe..e91a9f5 100755
--- a/main.ml
+++ b/main.ml
@@ -127,8 +127,8 @@ let rec normal_mode (t, screen) = begin
   | Actions.Search ->
     let expr = Screen.search screen
     |> Expression.load in
-    let pattern = Expression.eval expr (fun _ -> ScTypes.Refs.Single ScTypes.Undefined) in
-    begin match Sheet.search (`Pattern pattern) t with
+    let pattern = Expression.eval expr (fun _ -> ScTypes.Refs.Single None) in
+    begin match Sheet.search (`Pattern (Some pattern)) t with
     | Some t' -> normal_mode @@ redraw t' screen
     | None -> normal_mode (t, screen)
     end
@@ -231,11 +231,6 @@ let () = begin
     else
       Odf.load Sys.argv.(1) in
 
-  let window = Screen.init () in
-  begin Tools.try_finally
-    (fun () ->
+  Screen.run (fun window ->
       ignore @@ normal_mode @@ redraw (Sheet.create sheet) window)
-    (fun () ->
-      ignore @@ Screen.close window; )
-  end
 end