From faa830c592afd529f753cd72a69f98354a79c25d Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Sat, 29 Jul 2017 15:30:04 +0300 Subject: [PATCH] fix layout name on copy method --switch current layout after saveAllChanges only when we rename the current layout --- app/layoutconfigdialog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/layoutconfigdialog.cpp b/app/layoutconfigdialog.cpp index 0b01d533d..045d3cdf6 100644 --- a/app/layoutconfigdialog.cpp +++ b/app/layoutconfigdialog.cpp @@ -160,7 +160,7 @@ void LayoutConfigDialog::on_copyButton_clicked() QString id = m_model->data(m_model->index(row, IDCOLUMN), Qt::DisplayRole).toString(); QString color = m_model->data(m_model->index(row, COLORCOLUMN), Qt::BackgroundRole).toString(); - QString layoutName = m_model->data(m_model->index(row, NAMECOLUMN), Qt::DisplayRole).toString(); + QString layoutName = uniqueLayoutName(m_model->data(m_model->index(row, NAMECOLUMN), Qt::DisplayRole).toString()); bool menu = m_model->data(m_model->index(row, MENUCOLUMN), Qt::DisplayRole).toString() == CheckMark; QString copiedId = tempDir + "/" + layoutName + ".layout.latte"; @@ -169,7 +169,7 @@ void LayoutConfigDialog::on_copyButton_clicked() LayoutSettings *settings = new LayoutSettings(this, copiedId); m_layouts[copiedId] = settings; - insertLayoutInfoAtRow(row + 1, copiedId, color, uniqueLayoutName(layoutName), menu, QStringList()); + insertLayoutInfoAtRow(row + 1, copiedId, color, layoutName, menu, QStringList()); ui->layoutsView->selectRow(row + 1); }