GuiSelection: make sure the initial check is done

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

diff --git a/src/frontends/qt4/GuiSelection.cpp b/src/frontends/qt4/GuiSelection.cpp
index 58c5b7b72b746563bf4dcaad7c5edfe9af02a2ec..77c7113c53be77dc1fb5c542d27aa341d254c19b 100644 (file)
--- a/src/frontends/qt4/GuiSelection.cpp
+++ b/src/frontends/qt4/GuiSelection.cpp
@@ -32,7 +32,8 @@ using support::externalLineEnding;
 
 
 GuiSelection::GuiSelection()
-       : selection_supported_(qApp->clipboard()->supportsSelection())
+       : selection_supported_(qApp->clipboard()->supportsSelection()),
+       schedule_check_(true)
 {
        connect(qApp->clipboard(), SIGNAL(selectionChanged()),
                this, SLOT(on_dataChanged()));
@@ -101,14 +102,17 @@ bool GuiSelection::empty() const
        if (!selection_supported_)
                return true;
 
+       // Cache which is to speed up selection-status read
+       // (4 calls when openi Edit menu).
+       static bool text_selection_empty;
        if (schedule_check_) {
-               text_selection_empty_ = qApp->clipboard()->
+               text_selection_empty = qApp->clipboard()->
                        text(QClipboard::Selection).isEmpty();
                schedule_check_ = false;
        }
 
-       LYXERR(Debug::SELECTION, "GuiSelection::filled: " << !text_selection_empty_);
-       return text_selection_empty_;
+       LYXERR(Debug::SELECTION, "GuiSelection::filled: " << !text_selection_empty);
+       return text_selection_empty;
 }
 
 } // namespace frontend

diff --git a/src/frontends/qt4/GuiSelection.h b/src/frontends/qt4/GuiSelection.h
index 9ab5b1d4fc44baba875bd8f8fc38fd127ef734d8..1567b3e697f5f4734e6bcae98fa30542270686d2 100644 (file)
--- a/src/frontends/qt4/GuiSelection.h
+++ b/src/frontends/qt4/GuiSelection.h
@@ -44,9 +44,6 @@ private Q_SLOTS:
        void on_dataChanged();
 
 private:
-       // Cache which is to speed up selection-status read
-       // (4 calls when openi Edit menu).
-       mutable bool text_selection_empty_;
        // Direct call clipboard()->text(QClipboard::Selection) inside onDataChanged causes
        // selection to be obtained. Now imagine the some LyX instance A, when making selection -
        // each change triggers onDataChange in all others instances for each mouse