[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [gcompris] src/core: core, support for local wordset fix2
From:       Bruno Coudoin <bruno.coudoin () gcompris ! net>
Date:       2016-07-03 21:59:26
Message-ID: E1bJpQE-0007bK-Ga () code ! kde ! org
[Download RAW message or body]

Git commit 6a6d8f5e3d2cef52260b5af9d673bdf467bf581a by Bruno Coudoin.
Committed on 03/07/2016 at 21:58.
Pushed by bcoudoin into branch 'master'.

core, support for local wordset fix2

This fixes a bad commit #e3c54ed3b794, I skipped the declaration part.

M  +3    -2    src/core/main.qml

http://commits.kde.org/gcompris/6a6d8f5e3d2cef52260b5af9d673bdf467bf581a

diff --git a/src/core/main.qml b/src/core/main.qml
index 7806d4c..7b53a68 100644
--- a/src/core/main.qml
+++ b/src/core/main.qml
@@ -108,8 +108,9 @@ Window {
     }
 
     function checkWordset() {
+        var wordset = ApplicationSettings.wordset
         if(ApplicationSettings.wordset == '')
-            return
+            wordset = 'data2/words/words.rcc'
 
         // check for words.rcc:
         if (DownloadManager.isDataRegistered("words")) {
@@ -123,7 +124,7 @@ Window {
                     if(wordset === arguments[0]) {
                         DownloadManager.resourceRegistered.disconnect(arguments.callee);
                         // force configuration to use the local wordset
-                        ApplicationSettings.wordset = 'data2/words/words.rcc'
+                        ApplicationSettings.wordset = wordset
                     }
                 })
             }
[prev in list] [next in list] [prev in thread] [next in thread]