mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Made the check for duplicate style names when creating or editing styles case insensitive. Closes $777.

Browse source 
Originally committed to SVN as r3161.
This commit is contained in:
Thomas Goyne 2009-07-18 03:45:16 +00:00
parent a7d0b591f8
commit 6608ff47b5
1 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
aegisub/src/dialog_style_editor.cpp
View file

@ -436,21 +436,8 @@ void DialogStyleEditor::Apply (bool apply,bool close) {
// Check if style name is unique // Check if style name is unique
for (unsigned int i=0;i<styles.Count();i++) { for (unsigned int i=0;i<styles.Count();i++) {
if (styles[i] == newStyleName) { if (newStyleName.CmpNoCase(styles[i]) == 0) {
bool ok = true; if ((isLocal && grid->ass->GetStyle(styles[i]) != style) || (!isLocal && store->GetStyle(styles[i]) != style)) {
// Local
if (isLocal) {
if (grid->ass->GetStyle(styles[i]) != style) ok = false;
}
// Storage
else {
if (store->GetStyle(styles[i]) != style) ok = false;
}
// Repeated name
if (!ok) {
wxMessageBox(_T("There is already a style with this name. Please choose another name."),_T("Style name conflict."),wxICON_ERROR); wxMessageBox(_T("There is already a style with this name. Please choose another name."),_T("Style name conflict."),wxICON_ERROR);
return; return;
} }