Merge with default

Themes/_fallback/Languages/en.ini

@@ -372,7 +372,7 @@ MaxTextureResolution=Choose the maximum texture resolution.  Setting this to any
 MenuTimer=When &oq;ON&cq;, menus have a time limit.
 Mines=Mines
 MoveRandomToEnd=Determines if courses with random songs should be placed at the end of the course select wheel.
-MovieColorDepth=Choose the color depth of textures. 32 bit textures use more memory, but look nicer.
+MovieColorDepth=Choose the color depth of movies. 32 bit textures use more memory, but look nicer.
 MusicWheelSwitchSpeed=Adjusts the speed of the music wheel.
 MusicWheelUsesSections=&oq;Always&cq; means sections in group + ABC; &oq;Never&cq; means no sections; &oq;Title Only&cq; shows sections in ABC order.
 Network Options=Connect to a server or change server options.

src/ScreenOptionsToggleSongs.cpp

@@ -11,7 +11,6 @@
 
 // main page (group list)
 REGISTER_SCREEN_CLASS( ScreenOptionsToggleSongs );
-REGISTER_SCREEN_CLASS( ScreenOptionsToggleSongsSubPage );
 
 void ScreenOptionsToggleSongs::BeginScreen()
 {
@@ -49,8 +48,7 @@ void ScreenOptionsToggleSongs::ProcessMenuStart( const InputEventPlus &input )
 
 	// switch to the subpage with the specified group
 	int iRow = GetCurrentRow();
-	OptionRow &row = *m_pRows[iRow];
-	if( row.GetRowType() == OptionRow::RowType_Exit )
+	if( m_pRows[iRow]->GetRowType() == OptionRow::RowType_Exit )
 	{
 		ScreenOptions::ProcessMenuStart( input );
 		return;
@@ -70,6 +68,7 @@ void ScreenOptionsToggleSongs::ExportOptions( int row, const vector<PlayerNumber
 }
 
 // subpage (has the songs in a specific group)
+REGISTER_SCREEN_CLASS( ScreenOptionsToggleSongsSubPage );
 void ScreenOptionsToggleSongsSubPage::BeginScreen()
 {
 	m_apSongs.clear();

src/StatsManager.cpp

@@ -242,10 +242,14 @@ void StatsManager::CommitStatsToProfiles( const StageStats *pSS )
 				pPlayerProfile->m_iNumTotalSongsPlayed += pSS->m_vpPlayedSongs.size();
 			}
 
+			LOG->Trace("Adding stats to machine profile...");
 			AddPlayerStatsToProfile( pMachineProfile, *pSS, pn );
 
 			if( pPlayerProfile )
+			{
+				LOG->Trace("Adding stats to player profile...");
 				AddPlayerStatsToProfile( pPlayerProfile, *pSS, pn );
+			}
 
 			CHECKPOINT;
 		}