[Libreoffice-commits] core.git: vcl/unx

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Sat Apr 25 15:50:53 UTC 2020


 vcl/unx/gtk3/gtk3gtkinst.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3e3e28dcc89f0b756a7f2af1d410a42655b58a88
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Apr 24 12:38:29 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Apr 25 17:50:16 2020 +0200

    ignore mrucount if the entry was not found
    
    Change-Id: I4b69964fc888b18a5e3baff6a1aeec3bf23c8015
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92852
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 04a6f68837ea..cb88d8f4b486 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -13862,7 +13862,7 @@ public:
     virtual int find_text(const OUString& rStr) const override
     {
         int nPos = find_text_including_mru(rStr, false);
-        if (m_nMRUCount)
+        if (nPos != -1 && m_nMRUCount)
             nPos -= (m_nMRUCount + 1);
         return nPos;
     }
@@ -13870,7 +13870,7 @@ public:
     virtual int find_id(const OUString& rId) const override
     {
         int nPos = find_id_including_mru(rId, false);
-        if (m_nMRUCount)
+        if (nPos != -1 && m_nMRUCount)
             nPos -= (m_nMRUCount + 1);
         return nPos;
     }


More information about the Libreoffice-commits mailing list