From 324dabb7be47786245f0130456ddea67fc9e626b Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <coolreader.org@gmail.com>
Date: Tue, 11 Oct 2016 15:12:31 +0300
Subject: [PATCH] streams

---
 src/dlangui/core/editable.d | 6 ++++--
 src/dlangui/core/streams.d  | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/dlangui/core/editable.d b/src/dlangui/core/editable.d
index 8b56c789..b2b1f8ab 100644
--- a/src/dlangui/core/editable.d
+++ b/src/dlangui/core/editable.d
@@ -1420,9 +1420,11 @@ class EditableContent {
     bool load(string filename) {
         clear();
         try {
-            InputStream f = new FileInputStream(filename);
+            InputStream f;
+            f = new FileInputStream(filename);
             scope(exit) { f.close(); }
-            return load(f, filename);
+            bool res = load(f, filename);
+            return res;
         } catch (Exception e) {
             Log.e("Exception while trying to read file ", filename, " ", e.toString);
             clear();
diff --git a/src/dlangui/core/streams.d b/src/dlangui/core/streams.d
index 93ef166a..089e58c3 100644
--- a/src/dlangui/core/streams.d
+++ b/src/dlangui/core/streams.d
@@ -22,7 +22,8 @@ class FileInputStream : InputStream {
         _file = std.stdio.File(filename, "rb");
     }
     void close() {
-        _file.close();
+        if (isOpen)
+            _file.close();
     }
     size_t read(ubyte[] buffer) {
         ubyte[] res = _file.rawRead(buffer);