AxioDL
/
amuse
mirror of https://github.com/AxioDL/amuse.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge commit '40e808e'

This commit is contained in:
Phillip Stephens 2016-05-31 15:41:16 -07:00
parent 4b102388f1 40e808e134
commit 08de4873f4
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
driver/main.cpp
View File

@ -731,7 +731,7 @@ struct AppCallback : boo::IApplicationCallback
exit(1); exit(1);
} }
} }
else else if (songs.size() == 1)
{ {
m_arrData = &songs[0].second; m_arrData = &songs[0].second;
m_groupId = m_arrData->m_groupId; m_groupId = m_arrData->m_groupId;

3
lib/ContainerRegistry.cpp
View File

@ -107,7 +107,8 @@ static bool IsSongExtension(const char* path, const char*& dotOut)
if (ext) if (ext)
{ {
if (!CompareCaseInsensitive(ext, ".son") || if (!CompareCaseInsensitive(ext, ".son") ||
!CompareCaseInsensitive(ext, ".sng")) !CompareCaseInsensitive(ext, ".sng") ||
!CompareCaseInsensitive(ext, ".song"))
{ {
dotOut = ext; dotOut = ext;
return true; return true;