rpm/kmahjongg
SHA256
1
0
Fork 0
forked from pool/kmahjongg
Code Pull Requests Activity

Accepting request 405880 from home:wolfi323:branches:KDE:Applications

Browse Source 
- Add fix-endless-loop.patch: fixes endless loop on startup if the configured layout cannot be loaded (boo#983173, kde#361132)

OBS-URL: https://build.opensuse.org/request/show/405880
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kmahjongg?expand=0&rev=33
This commit is contained in:
Raymond Wooninck 2016-07-01 13:59:09 +00:00 committed by Git OBS Bridge
parent 96db1b3ff6
commit b6cbfa8d94
3 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
fix-endless-loop.patch Normal file
View File

@ -0,0 +1,29 @@
From: Wolfgang Bauer <wbauer@tmo.at>
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());
}
}

6
kmahjongg.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jul 1 12:56:18 UTC 2016 - wbauer@tmo.at
- Add fix-endless-loop.patch: fixes endless loop on startup if the
configured layout cannot be loaded (boo#983173, kde#361132)
-------------------------------------------------------------------
Fri Jun 10 18:00:55 UTC 2016 - tittiatcoke@gmail.com

3
kmahjongg.spec
View File

@ -43,6 +43,8 @@ Url: http://www.kde.org
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 @@ by removing pieces of the same type.
%prep
%setup -q -n kmahjongg-%{version}
%patch -p1
%build
%cmake_kf5 -d build