From 68ee06ef11acbb52ec08b94b233bdedf5940b6d5 Mon Sep 17 00:00:00 2001
From: mmorrison <mmorrison@pon4.net>
Date: Sun, 6 Jan 2019 17:55:12 -0600
Subject: [PATCH] Allow encoding override by parameter (1.0.49)

---
 lib/reader.js | 2 +-
 package.json  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/reader.js b/lib/reader.js
index 92c6206..2974e71 100644
--- a/lib/reader.js
+++ b/lib/reader.js
@@ -43,7 +43,7 @@ class Reader {
             else options = args[0];
         }
 
-        options.encoding = options.encoding || this.query.encoding;
+        options.encoding = options.encoding || this.query.options.encoding || this.query.encoding;
         if(options.encoding === 'latin1') options.encoding = 'win1252';
 
         const start = this.i+0;
diff --git a/package.json b/package.json
index 05d44b8..66048a9 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
 	],
 	"main": "lib/index.js",
 	"author": "Michael Morrison",
-	"version": "1.0.48",
+	"version": "1.0.49",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/sonicsnes/node-gamedig.git"