Hello community, here is the log from the commit of package kmahjongg for openSUSE:Factory checked in at 2016-07-03 12:28:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmahjongg (Old) and /work/SRC/openSUSE:Factory/.kmahjongg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmahjongg" Changes: -------- --- /work/SRC/openSUSE:Factory/kmahjongg/kmahjongg.changes 2016-06-25 02:02:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kmahjongg.new/kmahjongg.changes 2016-07-03 12:28:48.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jul 1 12:56:18 UTC 2016 - [email protected] + +- Add fix-endless-loop.patch: fixes endless loop on startup if the + configured layout cannot be loaded (boo#983173, kde#361132) + +------------------------------------------------------------------- New: ---- fix-endless-loop.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmahjongg.spec ++++++ --- /var/tmp/diff_new_pack.BF5sFt/_old 2016-07-03 12:28:49.000000000 +0200 +++ /var/tmp/diff_new_pack.BF5sFt/_new 2016-07-03 12:28:49.000000000 +0200 @@ -43,6 +43,8 @@ Version: 16.04.2 Release: 0 Source0: kmahjongg-%{version}.tar.xz +# PATCH-FIX-UPSTREAM fix-endless-loop.patch boo#983173, kde#361132 -- fixes endless loop on startup if the configured layout cannot be loaded +Patch: fix-endless-loop.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -53,6 +55,7 @@ %prep %setup -q -n kmahjongg-%{version} +%patch -p1 %build %cmake_kf5 -d build ++++++ fix-endless-loop.patch ++++++ From: Wolfgang Bauer <[email protected]> Date: Fri, 01 Jul 2016 11:30:27 +0000 Subject: Fix endless loop when configured layout cannot be loaded X-Git-Url: http://quickgit.kde.org/?p=kmahjongg.git&a=commitdiff&h=22600c69edbf59bc83377e3b96e3899ba935b1a3 --- Fix endless loop when configured layout cannot be loaded Adjust the configured layout when the default is loaded as fallback. Otherwise loadSettings() will think that the layout has been changed in the settings, load the layout again and call startNewGame(), which in turn calls loadSettings() again, resulting in an endless loop. BUG: 361132 FIXED-IN: 16.04.3 REVIEW: 128279 --- --- a/kmahjongg.cpp +++ b/kmahjongg.cpp @@ -266,6 +266,7 @@ qCDebug(KMAHJONGG_LOG) << "Error loading the layout. Try to load the default layout."; m_boardLayout->loadDefault(); + Prefs::setLayout(m_boardLayout->path()); } }
