1 files changed, 57 insertions, 47 deletions

diff --git a/application/dialogs/CopyInstanceDialog.cpp b/application/dialogs/CopyInstanceDialog.cpp
index 72ef00fa..6100860c 100644
--- a/application/dialogs/CopyInstanceDialog.cpp
+++ b/application/dialogs/CopyInstanceDialog.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 MultiMC Contributors
+/* Copyright 2013-2019 MultiMC Contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,87 +29,97 @@
 #include "InstanceList.h"
 
 CopyInstanceDialog::CopyInstanceDialog(InstancePtr original, QWidget *parent)
-	:QDialog(parent), ui(new Ui::CopyInstanceDialog), m_original(original)
+    :QDialog(parent), ui(new Ui::CopyInstanceDialog), m_original(original)
 {
-	ui->setupUi(this);
-	resize(minimumSizeHint());
-	layout()->setSizeConstraint(QLayout::SetFixedSize);
-
-	InstIconKey = original->iconKey();
-	ui->iconButton->setIcon(MMC->icons()->getIcon(InstIconKey));
-	ui->instNameTextBox->setText(original->name());
-	ui->instNameTextBox->setFocus();
-	auto groups = MMC->instances()->getGroups().toSet();
-	auto groupList = QStringList(groups.toList());
-	groupList.sort(Qt::CaseInsensitive);
-	groupList.removeOne("");
-	groupList.push_front("");
-	ui->groupBox->addItems(groupList);
-	int index = groupList.indexOf(m_original->group());
-	if(index == -1)
-	{
-		index = 0;
-	}
-	ui->groupBox->setCurrentIndex(index);
-	ui->groupBox->lineEdit()->setPlaceholderText(tr("No group"));
-	ui->copySavesCheckbox->setChecked(m_copySaves);
+    ui->setupUi(this);
+    resize(minimumSizeHint());
+    layout()->setSizeConstraint(QLayout::SetFixedSize);
+
+    InstIconKey = original->iconKey();
+    ui->iconButton->setIcon(MMC->icons()->getIcon(InstIconKey));
+    ui->instNameTextBox->setText(original->name());
+    ui->instNameTextBox->setFocus();
+    auto groups = MMC->instances()->getGroups().toSet();
+    auto groupList = QStringList(groups.toList());
+    groupList.sort(Qt::CaseInsensitive);
+    groupList.removeOne("");
+    groupList.push_front("");
+    ui->groupBox->addItems(groupList);
+    int index = groupList.indexOf(MMC->instances()->getInstanceGroup(m_original->id()));
+    if(index == -1)
+    {
+        index = 0;
+    }
+    ui->groupBox->setCurrentIndex(index);
+    ui->groupBox->lineEdit()->setPlaceholderText(tr("No group"));
+    ui->copySavesCheckbox->setChecked(m_copySaves);
 }
 
 CopyInstanceDialog::~CopyInstanceDialog()
 {
-	delete ui;
+    delete ui;
 }
 
 void CopyInstanceDialog::updateDialogState()
 {
-	ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!instName().isEmpty());
+    auto allowOK = !instName().isEmpty();
+    auto OkButton = ui->buttonBox->button(QDialogButtonBox::Ok);
+    if(OkButton->isEnabled() != allowOK)
+    {
+        OkButton->setEnabled(allowOK);
+    }
 }
 
 QString CopyInstanceDialog::instName() const
 {
-	return ui->instNameTextBox->text();
+    auto result = ui->instNameTextBox->text().trimmed();
+    if(result.size())
+    {
+        return result;
+    }
+    return QString();
 }
 
 QString CopyInstanceDialog::iconKey() const
 {
-	return InstIconKey;
+    return InstIconKey;
 }
 
 QString CopyInstanceDialog::instGroup() const
 {
-	return ui->groupBox->currentText();
+    return ui->groupBox->currentText();
 }
 
 void CopyInstanceDialog::on_iconButton_clicked()
 {
-	IconPickerDialog dlg(this);
-	dlg.execWithSelection(InstIconKey);
-
-	if (dlg.result() == QDialog::Accepted)
-	{
-		InstIconKey = dlg.selectedIconKey;
-		ui->iconButton->setIcon(MMC->icons()->getIcon(InstIconKey));
-	}
+    IconPickerDialog dlg(this);
+    dlg.execWithSelection(InstIconKey);
+
+    if (dlg.result() == QDialog::Accepted)
+    {
+        InstIconKey = dlg.selectedIconKey;
+        ui->iconButton->setIcon(MMC->icons()->getIcon(InstIconKey));
+    }
 }
 
 void CopyInstanceDialog::on_instNameTextBox_textChanged(const QString &arg1)
 {
-	updateDialogState();
+    updateDialogState();
 }
 
 bool CopyInstanceDialog::shouldCopySaves() const
 {
-	return m_copySaves;
+    return m_copySaves;
 }
 
 void CopyInstanceDialog::on_copySavesCheckbox_stateChanged(int state)
 {
-	if(state == Qt::Unchecked)
-	{
-		m_copySaves = false;
-	}
-	else if(state == Qt::Checked)
-	{
-		m_copySaves = true;
-	}
+    if(state == Qt::Unchecked)
+    {
+        m_copySaves = false;
+    }
+    else if(state == Qt::Checked)
+    {
+        m_copySaves = true;
+    }
 }