X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Freader%2Fui%2FGuiReader.java;h=1d782129276aaa0744ab414b40b0b09ebd9662de;hb=7cc1e74322fcf0e1b53ea7042db852a119fa99a6;hp=0cace9cd992b2fe317642316255a7dfcbf174b36;hpb=bf2b37b0aca363d30d8086c440dd2cb23e6e0915;p=fanfix.git

diff --git a/src/be/nikiroo/fanfix/reader/ui/GuiReader.java b/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
index 0cace9c..1d78212 100644
--- a/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
+++ b/src/be/nikiroo/fanfix/reader/ui/GuiReader.java
@@ -223,7 +223,7 @@ class GuiReader extends BasicReader {
 
 	@Override
 	public void search(boolean sync) throws IOException {
-		GuiReaderSearch search = new GuiReaderSearch(this);
+		GuiReaderSearchFrame search = new GuiReaderSearchFrame(this);
 		if (sync) {
 			sync(search);
 		} else {
@@ -234,7 +234,16 @@ class GuiReader extends BasicReader {
 	@Override
 	public void search(SupportType searchOn, String keywords, int page,
 			int item, boolean sync) {
-		GuiReaderSearch search = new GuiReaderSearch(this);
+		final GuiReaderSearchFrame search = new GuiReaderSearchFrame(
+				GuiReader.this);
+		while (!search.isEnabled()) {
+			try {
+				Thread.sleep(10);
+			} catch (InterruptedException e) {
+				Instance.getTraceHandler().error(e);
+			}
+		}
+
 		search.search(searchOn, keywords, page, item);
 		if (sync) {
 			sync(search);
@@ -247,7 +256,16 @@ class GuiReader extends BasicReader {
 	public void searchTag(final SupportType searchOn, final int page,
 			final int item, final boolean sync, final Integer... tags) {
 
-		final GuiReaderSearch search = new GuiReaderSearch(GuiReader.this);
+		final GuiReaderSearchFrame search = new GuiReaderSearchFrame(
+				GuiReader.this);
+		while (!search.isEnabled()) {
+			try {
+				Thread.sleep(10);
+			} catch (InterruptedException e) {
+				Instance.getTraceHandler().error(e);
+			}
+		}
+
 		final BasicSearchable searchable = BasicSearchable
 				.getSearchable(searchOn);
 
@@ -257,9 +275,6 @@ class GuiReader extends BasicReader {
 				SearchableTag tag = null;
 				try {
 					tag = searchable.getTag(tags);
-					if (tag != null) {
-						searchable.fillTag(tag);
-					}
 				} catch (IOException e) {
 					Instance.getTraceHandler().error(e);
 				}