GH-1652 save all instance settings on launch if instance window is already open

This commit is contained in:
Petr Mrázek
2016-10-28 03:36:29 +02:00
parent dd0e996081
commit 8731318fef
6 changed files with 28 additions and 6 deletions

View File

@ -1463,6 +1463,15 @@ void MainWindow::launch(InstancePtr instance, bool online, BaseProfilerFactory *
{
if(instance->canLaunch())
{
// FIXME: duplicate logic between MainWindow and InstanceWindow
auto window = m_instanceWindows.find(instance->id());
if(window != m_instanceWindows.end())
{
if(!(*window)->saveAll())
{
return;
}
}
m_launchController.reset(new LaunchController());
m_launchController->setInstance(instance);
m_launchController->setOnline(online);