avoid situations when CalcThread is not yet cancelled new CalThread starts working

This commit is contained in:
Konstantin Bulenkov
2017-10-06 13:11:24 -07:00
parent 1ee0ccb45a
commit 8a8f79a4a7
@@ -1,18 +1,4 @@
/*
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.ide.actions;
import com.intellij.codeInsight.lookup.LookupManager;
@@ -585,7 +571,7 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
if (myCurrentWorker.isDone()) {
myCurrentWorker.doWhenDone(run);
} else {
myCurrentWorker.doWhenRejected(run);
myCurrentWorker.doWhenProcessed(run);
}
}
@@ -2126,7 +2112,7 @@ public class SearchEverywhereAction extends AnAction implements CustomComponentA
public ActionCallback cancel() {
myProgressIndicator.cancel();
myDone.setRejected();
//myDone.setRejected();
return myDone;
}