From fd2023ee385fceeaf83e98349571e066c8bb67f4 Mon Sep 17 00:00:00 2001
From: panyun <help@panyun.io>
Date: Tue, 23 Jul 2019 11:27:14 +0800
Subject: [PATCH] Fix issue(db file Merge issue in windows env): (#15)

* Fix issue(windows env):
1. Run my program firstly, it will create my.db folder normaly.
2. Close my program and restart it again, I will receive an error.

* Fix coding format issue

* Change the last fixing with @prologic suggestion.
---
 internal/datafile.go | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/internal/datafile.go b/internal/datafile.go
index 576f928..ad96637 100644
--- a/internal/datafile.go
+++ b/internal/datafile.go
@@ -91,12 +91,14 @@ func (df *Datafile) Name() string {
 }
 
 func (df *Datafile) Close() error {
+	defer func() {
+		df.ra.Close()
+		df.r.Close()
+	}()
+
+	// Readonly Datafile -- Nothing further to close on the write side
 	if df.w == nil {
-		err := df.ra.Close()
-		if err != nil {
-			return err
-		}
-		return df.r.Close()
+		return nil
 	}
 
 	err := df.Sync()