Disallow multiple concurrent previews as we are not ready for that.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32603 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 0cc79708ec9f17361c2856f82eb50d3b65a8288e..de7d60e125ffda8b8f19cb37ee820b54469a822d 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -268,6 +268,8 @@ struct GuiView::GuiViewPrivate
 
        void setPreviewFuture(QFuture<docstring> const & f)
        {
+               if (preview_watcher_.isRunning())
+                       preview_watcher_.waitForFinished();
                preview_watcher_.setFuture(f);
                connect(&preview_watcher_, SIGNAL(finished()), gv_,
                        SLOT(threadFinished()));
@@ -1312,12 +1314,13 @@ bool GuiView::getStatus(FuncRequest const & cmd, FuncStatus & flag)
 
        case LFUN_MASTER_BUFFER_UPDATE:
        case LFUN_MASTER_BUFFER_VIEW: 
-               enable = doc_buffer && doc_buffer->parent() != 0;
+               enable = doc_buffer && doc_buffer->parent() != 0
+                       && !d.preview_watcher_.isRunning();
                break;
 
        case LFUN_BUFFER_UPDATE:
        case LFUN_BUFFER_VIEW: {
-               if (!doc_buffer) {
+               if (!doc_buffer || d.preview_watcher_.isRunning()) {
                        enable = false;
                        break;
                }