From 40e808e134e93ea458cf146fa5d80769a48ab0fd Mon Sep 17 00:00:00 2001
From: Phillip Stephens <antidote.crk@gmail.com>
Date: Tue, 31 May 2016 15:40:09 -0700
Subject: [PATCH] Add failsafe and .song extension

---
 driver/main.cpp           | 2 +-
 lib/ContainerRegistry.cpp | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/driver/main.cpp b/driver/main.cpp
index 060e54a..fb1a5fa 100644
--- a/driver/main.cpp
+++ b/driver/main.cpp
@@ -664,7 +664,7 @@ struct AppCallback : boo::IApplicationCallback
                     else
                         Log.report(logvisor::Fatal, "unable to find Song %d", userSel);
                 }
-                else
+                else if (songs.size() == 1)
                 {
                     m_arrData = &songs[0].second;
                     m_groupId = m_arrData->m_groupId;
diff --git a/lib/ContainerRegistry.cpp b/lib/ContainerRegistry.cpp
index 933f1cd..20141d6 100644
--- a/lib/ContainerRegistry.cpp
+++ b/lib/ContainerRegistry.cpp
@@ -107,7 +107,8 @@ static bool IsSongExtension(const char* path, const char*& dotOut)
     if (ext)
     {
         if (!CompareCaseInsensitive(ext, ".son") ||
-            !CompareCaseInsensitive(ext, ".sng"))
+            !CompareCaseInsensitive(ext, ".sng") ||
+            !CompareCaseInsensitive(ext, ".song"))
         {
             dotOut = ext;
             return true;