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());
     }
 }