Update SbieView.cpp
Fix https://github.com/sandboxie-plus/Sandboxie/issues/2231 OldValue should be the underlined version, which should be in the same format as m_Groups Value. Otherwise OldValue can never be found in m_Groups. Fix BoxDisplayOrder not being refreshed in time when renaming and deleting sandbox operations.
This commit is contained in:
parent
138387328a
commit
e254b95cb2
|
@ -1198,14 +1198,14 @@ void CSbieView::OnSandBoxAction(QAction* Action, const QList<CSandBoxPtr>& SandB
|
||||||
}
|
}
|
||||||
else if (Action == m_pMenuRename)
|
else if (Action == m_pMenuRename)
|
||||||
{
|
{
|
||||||
QString OldValue = SandBoxes.first()->GetName().replace("_", " ");
|
QString OldValue = SandBoxes.first()->GetName();
|
||||||
QString Value = QInputDialog::getText(this, "Sandboxie-Plus", tr("Please enter a new name for the Sandbox."), QLineEdit::Normal, OldValue);
|
QString Value = QInputDialog::getText(this, "Sandboxie-Plus", tr("Please enter a new name for the Sandbox."), QLineEdit::Normal, OldValue).replace(" ", "_");
|
||||||
if (Value.isEmpty() || Value == OldValue)
|
if (Value.isEmpty() || Value == OldValue)
|
||||||
return;
|
return;
|
||||||
if (!TestNameAndWarn(Value))
|
if (!TestNameAndWarn(Value))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
Results.append((SandBoxes.first()->RenameBox(Value.replace(" ", "_"))));
|
Results.append((SandBoxes.first()->RenameBox(Value)));
|
||||||
|
|
||||||
RenameItem(OldValue, Value);
|
RenameItem(OldValue, Value);
|
||||||
}
|
}
|
||||||
|
@ -1226,6 +1226,12 @@ void CSbieView::OnSandBoxAction(QAction* Action, const QList<CSandBoxPtr>& SandB
|
||||||
if (!Status.IsError())
|
if (!Status.IsError())
|
||||||
Status = pBox->RemoveBox();
|
Status = pBox->RemoveBox();
|
||||||
Results.append(Status);
|
Results.append(Status);
|
||||||
|
|
||||||
|
for (auto I = m_Groups.begin(); I != m_Groups.end(); ++I)
|
||||||
|
{
|
||||||
|
if (I.value().removeOne(pBox->GetName()))
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (Action == m_pMenuCleanUp)
|
else if (Action == m_pMenuCleanUp)
|
||||||
|
@ -1345,6 +1351,9 @@ void CSbieView::OnSandBoxAction(QAction* Action, const QList<CSandBoxPtr>& SandB
|
||||||
}
|
}
|
||||||
|
|
||||||
CSandMan::CheckResults(Results);
|
CSandMan::CheckResults(Results);
|
||||||
|
|
||||||
|
//m_UserConfigChanged = true;
|
||||||
|
SaveUserConfig();
|
||||||
}
|
}
|
||||||
|
|
||||||
void CSbieView::OnProcessAction()
|
void CSbieView::OnProcessAction()
|
||||||
|
|
Loading…
Reference in New Issue