mirror/MultiMC5
1
0
Fork 0
mirror of https://github.com/MultiMC/MultiMC5.git synced 2025-04-16 14:43:05 +00:00
Code Issues Projects Releases Wiki Activity

GH-336 Only allow non running instance renaming

Browse Source
This commit is contained in:
janrupf 2019-06-17 22:49:28 +02:00 committed by Petr Mrázek
parent 14c4df8427
commit f711425bcf
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/logic/BaseInstance.cpp
View File

@ -232,15 +232,21 @@ QString BaseInstance::iconKey() const
void BaseInstance::setName(QString val, bool requestDirChange) void BaseInstance::setName(QString val, bool requestDirChange)
{ {
if(m_settings->get("name") == val) { if(m_settings->get("name") == val)
{
return; return;
} }
m_settings->set("name", val); m_settings->set("name", val);
emit propertiesChanged(this); emit propertiesChanged(this);
if(requestDirChange) { if(requestDirChange && !isRunning())
{
emit instanceDirChangeRequest(this); emit instanceDirChangeRequest(this);
} }
else if(requestDirChange && isRunning())
{
qWarning() << "Tried to rename running instance with folder";
}
} }
QString BaseInstance::name() const QString BaseInstance::name() const

1
application/MainWindow.cpp
View File

@ -1831,6 +1831,7 @@ void MainWindow::instanceChanged(const QModelIndex &current, const QModelIndex &
ui->actionLaunchInstanceOffline->setEnabled(m_selectedInstance->canLaunch()); ui->actionLaunchInstanceOffline->setEnabled(m_selectedInstance->canLaunch());
ui->actionExportInstance->setEnabled(m_selectedInstance->canExport()); ui->actionExportInstance->setEnabled(m_selectedInstance->canExport());
ui->renameButton->setText(m_selectedInstance->name()); ui->renameButton->setText(m_selectedInstance->name());
ui->actionRenameInstance->setDisabled(m_selectedInstance->isRunning());
m_statusLeft->setText(m_selectedInstance->getStatusbarDescription()); m_statusLeft->setText(m_selectedInstance->getStatusbarDescription());
updateInstanceToolIcon(m_selectedInstance->iconKey()); updateInstanceToolIcon(m_selectedInstance->iconKey());