From 05059732f999827c8b82c7feefc390caee649f6f Mon Sep 17 00:00:00 2001
From: Thomas Goyne <plorkyeran@aegisub.org>
Date: Fri, 4 Nov 2011 19:42:12 +0000
Subject: [PATCH] Replace incorrect uses of bitwise or with logical or

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

diff --git a/aegisub/src/dialog_timing_processor.cpp b/aegisub/src/dialog_timing_processor.cpp
index 5582c02ee..dd3e4eb4e 100644
--- a/aegisub/src/dialog_timing_processor.cpp
+++ b/aegisub/src/dialog_timing_processor.cpp
@@ -238,7 +238,7 @@ void DialogTimingProcessor::UpdateControls() {
 	for (size_t i=0;i<len;i++) {
 		if (StyleList->IsChecked(i)) checked++;
 	}
-	ApplyButton->Enable(checked && (hasLeadIn->IsChecked() | hasLeadOut->IsChecked() | keysEnable->IsChecked() | adjsEnable->IsChecked()));
+	ApplyButton->Enable(checked && (hasLeadIn->IsChecked() || hasLeadOut->IsChecked() || keysEnable->IsChecked() || adjsEnable->IsChecked()));
 }
 
 BEGIN_EVENT_TABLE(DialogTimingProcessor,wxDialog)