Fixes to recover file system (#3722)
Don't auto-save while playing by default. On weaker machines (xp?) we
see glitches so better turn this on after need.
Remove the last of Limited Sessin which was removed in 290556e.
[cherry-picked from stable-1.2]
This commit is contained in:
@@ -105,8 +105,6 @@ public:
|
||||
return m_autoSaveTimer.interval();
|
||||
}
|
||||
|
||||
void runAutoSave();
|
||||
|
||||
enum SessionState
|
||||
{
|
||||
Normal,
|
||||
|
||||
@@ -958,7 +958,6 @@ int main( int argc, char * * argv )
|
||||
if( autoSaveEnabled )
|
||||
{
|
||||
gui->mainWindow()->autoSaveTimerReset();
|
||||
gui->mainWindow()->autoSave();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -821,7 +821,6 @@ void MainWindow::createNewProject()
|
||||
{
|
||||
Engine::getSong()->createNewProject();
|
||||
}
|
||||
runAutoSave();
|
||||
}
|
||||
|
||||
|
||||
@@ -840,7 +839,6 @@ void MainWindow::createNewProjectFromTemplate( QAction * _idx )
|
||||
Engine::getSong()->createNewProjectFromTemplate(
|
||||
dirBase + _idx->text() + ".mpt" );
|
||||
}
|
||||
runAutoSave();
|
||||
}
|
||||
|
||||
|
||||
@@ -865,7 +863,6 @@ void MainWindow::openProject()
|
||||
setCursor( Qt::ArrowCursor );
|
||||
}
|
||||
}
|
||||
runAutoSave();
|
||||
}
|
||||
|
||||
|
||||
@@ -917,7 +914,6 @@ void MainWindow::openRecentlyOpenedProject( QAction * _action )
|
||||
Engine::getSong()->loadProject( f );
|
||||
setCursor( Qt::ArrowCursor );
|
||||
}
|
||||
runAutoSave();
|
||||
}
|
||||
|
||||
|
||||
@@ -1557,15 +1553,3 @@ void MainWindow::autoSave()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// For the occasional auto save action that isn't run
|
||||
// from the timer where we need to do extra tests.
|
||||
void MainWindow::runAutoSave()
|
||||
{
|
||||
if( ConfigManager::inst()->value( "ui", "enableautosave" ).toInt() )
|
||||
{
|
||||
autoSave();
|
||||
autoSaveTimerReset(); // Reset timer
|
||||
}
|
||||
}
|
||||
|
||||
@@ -120,7 +120,7 @@ SetupDialog::SetupDialog( ConfigTabs _tab_to_open ) :
|
||||
m_backgroundArtwork( QDir::toNativeSeparators( ConfigManager::inst()->backgroundArtwork() ) ),
|
||||
m_smoothScroll( ConfigManager::inst()->value( "ui", "smoothscroll" ).toInt() ),
|
||||
m_enableAutoSave( ConfigManager::inst()->value( "ui", "enableautosave", "1" ).toInt() ),
|
||||
m_enableRunningAutoSave( ConfigManager::inst()->value( "ui", "enablerunningautosave", "1" ).toInt() ),
|
||||
m_enableRunningAutoSave( ConfigManager::inst()->value( "ui", "enablerunningautosave", "0" ).toInt() ),
|
||||
m_saveInterval( ConfigManager::inst()->value( "ui", "saveinterval" ).toInt() < 1 ?
|
||||
MainWindow::DEFAULT_SAVE_INTERVAL_MINUTES :
|
||||
ConfigManager::inst()->value( "ui", "saveinterval" ).toInt() ),
|
||||
@@ -1518,7 +1518,7 @@ void SetupDialog::resetAutoSave()
|
||||
{
|
||||
setAutoSaveInterval( MainWindow::DEFAULT_SAVE_INTERVAL_MINUTES );
|
||||
m_autoSave->setChecked( true );
|
||||
m_runningAutoSave->setChecked( true );
|
||||
m_runningAutoSave->setChecked( false );
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user