fix http://community.sharpdevelop.net/forums/p/16476/44890.aspx

icsharpcode · Jan 6, 2013 · b4149de · b4149de
1 parent 60855c9
commit b4149de
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Search/SearchCommands.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Search/SearchCommands.cs
@@ -73,9 +73,7 @@ void RegisterCommands(ICollection<CommandBinding> commandBindings)
 
 		void ExecuteFind(object sender, ExecutedRoutedEventArgs e)
 		{
-			if (panel.IsClosed) {
-				panel.Open();
-			}
+			panel.Open();
 			panel.SearchPattern = TextArea.Selection.GetText();
 			Dispatcher.CurrentDispatcher.BeginInvoke(DispatcherPriority.Input, (Action)delegate { panel.Reactivate(); });
 		}

diff --git a/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Search/SearchPanel.cs b/src/Libraries/AvalonEdit/ICSharpCode.AvalonEdit/Search/SearchPanel.cs
@@ -379,10 +379,12 @@ public void CloseAndRemove()
 		/// </summary>
 		public void Open()
 		{
+			if (!IsClosed) return;
 			var layer = AdornerLayer.GetAdornerLayer(textArea);
 			if (layer != null)
 				layer.Add(adorner);
 			textArea.TextView.BackgroundRenderers.Add(renderer);
+			IsClosed = false;
 		}
 
 		/// <summary>
@@ -391,7 +393,7 @@ public void Open()
 		public event EventHandler<SearchOptionsChangedEventArgs> SearchOptionsChanged;
 
 		/// <summary>
-		/// Raises the <see cref="SearchOptionsChanged" /> event.
+		/// Raises the <see cref="SearchPanel.SearchOptionsChanged" /> event.
 		/// </summary>
 		protected virtual void OnSearchOptionsChanged(SearchOptionsChangedEventArgs e)
 		{