From 437cd47cd3a28e19f55e77609c7f2f67e33ba885 Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Sun, 12 Feb 2012 04:16:14 +0000
Subject: [PATCH] Don't block editing storage styles with the same name as a
 style on the current script

Originally committed to SVN as r6466.
---
 aegisub/src/dialog_style_editor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aegisub/src/dialog_style_editor.cpp b/aegisub/src/dialog_style_editor.cpp
index de70749ae..edd7b7062 100644
--- a/aegisub/src/dialog_style_editor.cpp
+++ b/aegisub/src/dialog_style_editor.cpp
@@ -364,7 +364,7 @@ void DialogStyleEditor::Apply(bool apply, bool close) {
 		// Check if style name is unique
 		for (unsigned int i=0;i<styles.Count();i++) {
 			if (newStyleName.CmpNoCase(styles[i]) == 0) {
-				if ((store && store->GetStyle(styles[i]) != style) || c->ass->GetStyle(styles[i]) != style) {
+				if ((store && store->GetStyle(styles[i]) != style) || (!store && c->ass->GetStyle(styles[i]) != style)) {
 					wxMessageBox("There is already a style with this name. Please choose another name.", "Style name conflict.", wxICON_ERROR|wxOK);
 					return;
 				}