From 5aad7e0d45636f6e14149c75bcc0f9eb8c6376c8 Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Wed, 22 Feb 2017 21:21:04 +1300
Subject: [PATCH] Debug error; Touch context tracklist uri

---
 src/js/components/TouchContextMenu.js |  6 +++---
 src/js/components/TrackList.js        |  2 +-
 src/js/views/Debug.js                 | 10 ++++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/js/components/TouchContextMenu.js b/src/js/components/TouchContextMenu.js
index 5265b09a..9824e702 100755
--- a/src/js/components/TouchContextMenu.js
+++ b/src/js/components/TouchContextMenu.js
@@ -39,12 +39,12 @@ class TouchContextMenu extends React.Component{
 	}
 
 	playURIs(e){
-		this.props.mopidyActions.playURIs(this.props.menu.uris)
+		this.props.mopidyActions.playURIs(this.props.menu.uris, this.props.menu.tracklist_uri)
 		this.close()
 	}
 
 	playURIsNext(e){
-		this.props.mopidyActions.enqueueURIsNext(this.props.menu.uris)
+		this.props.mopidyActions.enqueueURIsNext(this.props.menu.uris, this.props.menu.tracklist_uri)
 		this.close()
 	}
 
@@ -54,7 +54,7 @@ class TouchContextMenu extends React.Component{
 	}
 
 	addToQueue(e){
-		this.props.mopidyActions.enqueueURIs(this.props.menu.uris)
+		this.props.mopidyActions.enqueueURIs(this.props.menu.uris, this.props.menu.tracklist_uri)
 		this.close()
 	}
 
diff --git a/src/js/components/TrackList.js b/src/js/components/TrackList.js
index a0d37851..48ddbcf0 100755
--- a/src/js/components/TrackList.js
+++ b/src/js/components/TrackList.js
@@ -142,7 +142,7 @@ class TrackList extends React.Component{
 		if( selected_tracks.length > 0 ){
 			var data = {
 				context: (this.props.context ? this.props.context : 'track'),
-				tracklist_uri: (this.props.tracklist_uri ? this.props.tracklist_uri : null),
+				tracklist_uri: (this.props.uri ? this.props.uri : null),
 				items: selected_tracks,
 				uris: helpers.asURIs(selected_tracks),
 				indexes: this.tracksIndexes(selected_tracks)
diff --git a/src/js/views/Debug.js b/src/js/views/Debug.js
index dd39cced..0b76012d 100755
--- a/src/js/views/Debug.js
+++ b/src/js/views/Debug.js
@@ -175,10 +175,12 @@ class Debug extends React.Component{
 
 const mapStateToProps = (state, ownProps) => {
 	return {
-		connectionid: state.pusher.connectionid,
-		emulate_touch: state.ui.emulate_touch,
-		log_actions: state.ui.log_actions,
-		debug_info: state.ui.debug_info,
+		connection_id: state.pusher.connection_id,
+		emulate_touch: (state.ui.emulate_touch ? state.ui.emulate_touch : false),
+		log_actions: (state.ui.log_actions ? state.ui.log_actions : false),
+		log_pusher: (state.ui.log_pusher ? state.ui.log_pusher : false),
+		log_mopidy: (state.ui.log_mopidy ? state.ui.log_mopidy : false),
+		debug_info: (state.ui.debug_info ? state.ui.debug_info : false),
 		debug_response: state.ui.debug_response
 	}
 }