Also remove 'CustomsLoadMax' pref; it's unhelpful and the load timeout is what matter...

diff --git a/src/PrefsManager.cpp b/src/PrefsManager.cpp
index 837261d..51d19e7 100755 (executable)
--- a/src/PrefsManager.cpp
+++ b/src/PrefsManager.cpp
@@ -199,9 +199,7 @@ PrefsManager::PrefsManager() :
        m_bCustomSongs                  ( "SongEdits", false ),
        m_bCustomSongPreviews           ( "CustomSongPreviews", false ),
 
-       m_iCustomsLoadMax               ( "CustomsLoadMax", 50 ),
        m_fCustomsLoadTimeout   ( "CustomsLoadTimeout", 5.0f ),
-
        m_iCustomMaxSeconds     ( "CustomMaxSeconds", 120 ),
 
        m_bCustomCourses        ( "CourseEdits", false ),

diff --git a/src/PrefsManager.h b/src/PrefsManager.h
index 33ec202..bbb6bfb 100755 (executable)
--- a/src/PrefsManager.h
+++ b/src/PrefsManager.h
@@ -179,7 +179,6 @@ public:
        // Player songs options
        Preference<bool>        m_bCustomSongs;
        Preference<bool>        m_bCustomSongPreviews;
-       Preference<int>         m_iCustomsLoadMax;
        Preference<float>       m_fCustomsLoadTimeout;
        Preference<int>         m_iCustomMaxSeconds;
 

diff --git a/src/ScreenOptionsMasterPrefs.cpp b/src/ScreenOptionsMasterPrefs.cpp
index 40a11a0..b8704e1 100755 (executable)
--- a/src/ScreenOptionsMasterPrefs.cpp
+++ b/src/ScreenOptionsMasterPrefs.cpp
@@ -326,12 +326,6 @@ static void CustomsLoadTimeout( int &sel, bool ToSel, const ConfOption *pConfOpt
        MoveMap( sel, PREFSMAN->m_fCustomsLoadTimeout, ToSel, mapping, ARRAYLEN(mapping) );
 }
 
-static void CustomsLoadMax( int &sel, bool ToSel, const ConfOption *pConfOption )
-{
-       const int mapping[] = { 10, 20, 30, 40, 50, 60, 70, 0 };
-       MoveMap( sel, PREFSMAN->m_iCustomsLoadMax, ToSel, mapping, ARRAYLEN(mapping) );
-}
-
 static void MarvelousTiming( int &sel, bool ToSel, const ConfOption *pConfOption )
 {
        const PrefsManager::MarvelousTiming mapping[] = { PrefsManager::MARVELOUS_NEVER, PrefsManager::MARVELOUS_COURSES_ONLY, PrefsManager::MARVELOUS_EVERYWHERE };
@@ -600,8 +594,6 @@ static void InitializeConfOptions()
                                                                                                        "3:30", "4:00", "4:30", "5:00", "5:30",
                                                                                                        "6:00", "7:00", "10:00", "UNLIMITED" ) );
        ADD( ConfOption( "CustomsLoadTimeout",                          CustomsLoadTimeout,     "5s", "10s", "15s", "20s", "25s", "30s", "45s", "1m" ) );
-       ADD( ConfOption( "CustomsLoadMax",                              CustomsLoadMax,         "10", "20", "30", "40", "50", "60", "UNLIMITED" ) );
-
        ADD( ConfOption( "CustomSongPreviews",                          CustomSongPreviews,     "OFF", "ON" ) );
 
        /* Machine options */

diff --git a/src/SongManager.cpp b/src/SongManager.cpp
index c9662d0..bfd7e4a 100755 (executable)
--- a/src/SongManager.cpp
+++ b/src/SongManager.cpp
@@ -315,7 +315,7 @@ void SongManager::LoadPlayerCourses( PlayerNumber pn )
                        delete crs;\r
                        continue;\r
                }\r
-               \r
+\r
                // TODO: softcode this to a settable preference\r
                if ( crs->GetEstimatedNumStages() > 5 )\r
                {\r
@@ -407,17 +407,9 @@ void SongManager::LoadPlayerSongs( PlayerNumber pn )
                        break;\r
                }\r
 \r
-               // we want to stop right on the number, not after. "Greater than" is added as a safeguard.\r
-               if( PREFSMAN->m_iCustomsLoadMax > 0 && iSongsLoaded >= PREFSMAN->m_iCustomsLoadMax )\r
-               {\r
-                       LOG->Warn( "Loading interrupted. Limit of %i songs was reached, after %f seconds.",\r
-                       (int)PREFSMAN->m_iCustomsLoadMax, LoadTimer.Ago() );\r
-                       break;\r
-               }\r
-\r
                CString sSongDirName = arraySongDirs[j];\r
                Song* pNewSong = new Song;\r
-               \r
+\r
                // we need a custom loader for these songs.\r
                if( !pNewSong->LoadFromCustomSongDir( sSongDirName, sGroupName, pn ) )\r
                {\r
@@ -426,9 +418,9 @@ void SongManager::LoadPlayerSongs( PlayerNumber pn )
                        delete pNewSong;\r
                        continue;\r
                }\r
-               \r
+\r
                LOG->Trace( "Loading custom song '%s'...", pNewSong->m_sMainTitle.c_str() );\r
-               \r
+\r
                // TODO: load everything into m_pCustomSongs, then insert() into m_pSongs,\r
                // instead of manually inserting the song into both arrays.\r
                m_pCustomSongs.push_back( pNewSong );\r