Fix merge error preventing any EPG data from being processed

djp952 · Apr 13, 2019 · 31ae929 · 31ae929
1 parent f9396e6
commit 31ae929
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/pvr.hdhomerundvr/changelog.txt b/pvr.hdhomerundvr/changelog.txt
@@ -1,3 +1,6 @@
+v2.0.1 (2019.04.12)
+  - Fix bug introduced in v2.0.0 preventing any EPG data from being processed
+
 v2.0.0 (2019.04.09)
   - Update SQLite database engine to version 3.27.2
   - Update cURL library to version 7.64.1

diff --git a/src/database.cpp b/src/database.cpp
@@ -1333,7 +1333,7 @@ void enumerate_guideentries(sqlite3* instance, char const* deviceauth, union cha
 		"get_season_number(json_extract(entry.value, '$.EpisodeNumber')) as seriesnumber, "
 		"get_episode_number(json_extract(entry.value, '$.EpisodeNumber')) as episodenumber, "
 		"case when ?2 then coalesce(json_extract(entry.value, '$.EpisodeNumber') || ' - ', '') else '' end || json_extract(entry.value, '$.EpisodeTitle') as episodename "
-		"from deviceauth, epg(?1, decode_channel_id(?3), ?4, ?5), json_each(json_extract(nullif(epg.value, 'null'), '$[0].Guide')) as entry";
+		"from epg(?1, decode_channel_id(?3), ?4, ?5), json_each(json_extract(nullif(epg.value, 'null'), '$[0].Guide')) as entry";
 
 	result = sqlite3_prepare_v2(instance, sql, -1, &statement, nullptr);
 	if(result != SQLITE_OK) throw sqlite_exception(result, sqlite3_errmsg(instance));

diff --git a/src/version.ini b/src/version.ini
@@ -8,4 +8,4 @@
 Company=Michael G. Brehm
 Copyright=
 Product=zuki.pvr.hdhomerundvr
-Version=2.0.0
+Version=2.0.1