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

List:       kde-commits
Subject:    [gcompris/KDE/0.60] src/core: core, support for local wordset fix2
From:       Bruno Coudoin <bruno.coudoin () gcompris ! net>
Date:       2016-07-03 22:13:11
Message-ID: E1bJpdX-0007XX-1d () code ! kde ! org
[Download RAW message or body]

Git commit c05eb48d3d2dd77d37e8c820e3c2e1b049c3a13b by Bruno Coudoin.
Committed on 03/07/2016 at 22:05.
Pushed by bcoudoin into branch 'KDE/0.60'.

core, support for local wordset fix2

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

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

http://commits.kde.org/gcompris/c05eb48d3d2dd77d37e8c820e3c2e1b049c3a13b

diff --git a/src/core/main.qml b/src/core/main.qml
index 1a7f070..e8062d4 100644
--- a/src/core/main.qml
+++ b/src/core/main.qml
@@ -111,8 +111,9 @@ Window {
     function checkWordset() {
         var wordset = ApplicationSettings.wordset
         if(wordset == '')
-            // Try the default one, maybe we have it bundled
-            wordset = "data2/words/words.rcc"
+            // Maybe the wordset has been bundled or copied manually
+            // we have to register it if we find it.
+            wordset = 'data2/words/words.rcc'
 
         // check for words.rcc:
         if (DownloadManager.isDataRegistered("words")) {
@@ -126,7 +127,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]