https://bugs.kde.org/show_bug.cgi?id=411602

michael <reeves...@gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|ASSIGNED                    |RESOLVED
         Resolution|---                         |FIXED
      Latest Commit|                            |https://invent.kde.org/kde/
                   |                            |kdiff3/commit/1c86432a9a72c
                   |                            |9fbf193d97035255e3a1b6cac09
   Version Fixed In|                            |1.8.2

--- Comment #2 from michael <reeves...@gmail.com> ---
Git commit 1c86432a9a72c9fbf193d97035255e3a1b6cac09 by Michael Reeves.
Committed on 16/09/2019 at 00:02.
Pushed by mreeves into branch 'master'.

Fix missing menu items.

Make sure all menu related actions are created before calling 
KXMLGUIClient::setXMLFile.
The actual signal connections can happen later.

Perfer having MergeResultWindow handle the creation and connection
of merge related actions that depend on it to function. Avoids potential
nullptr issue if one is triggered unexpectedly early in startup.  This also
improves readability KDiff3App is quite large even without this and would
just have small wrapper functions for these actions.

Thanks tur...@think-electric.com for spotting the bug.
FIXED-IN: 1.8.2

M  +92   -0    src/guiutils.h
M  +2    -0    src/kdiff3.cpp
M  +36   -9    src/mergeresultwindow.cpp
M  +12   -10   src/mergeresultwindow.h
M  +1    -1    src/pdiff.cpp

https://invent.kde.org/kde/kdiff3/commit/1c86432a9a72c9fbf193d97035255e3a1b6cac09

-- 
You are receiving this mail because:
You are watching all bug changes.

Reply via email to