From 68f3d7b91c9533b10542e6a22ee0b8203a0c5cb1 Mon Sep 17 00:00:00 2001
From: Jordan Eldredge <jordan@jordaneldredge.com>
Date: Thu, 12 Oct 2017 14:16:54 -0700
Subject: [PATCH] Clarify defaults

---
 js/config.js | 4 ++--
 js/winamp.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/config.js b/js/config.js
index e60c2297..27397d50 100644
--- a/js/config.js
+++ b/js/config.js
@@ -12,8 +12,8 @@ if (hash) {
 }
 
 // Turn on the incomplete playlist window
-export const skinUrl = skin;
-export const audioUrl = audio;
+export const skinUrl = config.skinUrl === undefined ? skin : config.skinUrl;
+export const audioUrl = config.audioUrl === undefined ? audio : config.audioUrl;
 export const playlistEnabled = config.playlist || false;
 export const noMarquee = config.noMarquee || false;
 export const hideAbout = config.hideAbout || false;
diff --git a/js/winamp.js b/js/winamp.js
index afa892bb..90f07445 100644
--- a/js/winamp.js
+++ b/js/winamp.js
@@ -37,7 +37,7 @@ class Winamp {
       this.store.dispatch(loadFileFromReference(e.target.files[0]));
     });
 
-    if (this.options.initialTrack) {
+    if (this.options.initialTrack && this.options.initialTrack.url) {
       this.store.dispatch(
         loadMediaFromUrl(
           this.options.initialTrack.url,