From 831a957f3cec12f389741823fbc90c40a1f827fc Mon Sep 17 00:00:00 2001
From: troido <troido@protonmail.com>
Date: Tue, 21 Apr 2020 09:08:19 +0200
Subject: left out Option::flatten() for rust 1.38 compatibility

---
 src/controls.rs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'src/controls.rs')

diff --git a/src/controls.rs b/src/controls.rs
index 8a10824..48d71ae 100644
--- a/src/controls.rs
+++ b/src/controls.rs
@@ -82,7 +82,15 @@ impl Control {
 				)),
 				"interact" => Some(Control::Interact(
 					parse_directions(val.get(1)?)?,
-					val.get(2).map(|v| Some(v.as_str()?.to_string())).flatten()
+					if let Some(argument) = val.get(2) {
+						match argument {
+							Value::String(arg) => Some(arg.to_string()),
+							Value::Null => None,
+							_ => {return None}
+						}
+					} else {
+						None
+					}
 				)),
 				_ => None
 			}
-- 
cgit