timeMerge default option changed

xan105 · Sep 22, 2019 · e15ef81 · e15ef81
1 parent 15f033a
commit e15ef81
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -144,8 +144,8 @@ Options are stored in ```%AppData%\Achievement Watcher\cfg\options.ini``` but mo
   Try to merge multiple achievement source for the same game.<br />
 
 - timeMergeRecentFirst<br/>
-  default to true<br />
-  When merging duplicates, show the most recent timestamp (set to false for the oldest).
+  default to false<br />
+  When merging duplicates, show the most recent timestamp instead of the oldest.
 
 - hideZero<br />
   default to false<br />

diff --git a/app/settings.js b/app/settings.js
@@ -34,7 +34,7 @@ module.exports.load = ()=>{
         }
 
         if (typeof options.achievement.timeMergeRecentFirst !== "boolean"){
-          options.achievement.timeMergeRecentFirst = true;
+          options.achievement.timeMergeRecentFirst = false;
         }
 
         if (typeof options.achievement.hideZero !== "boolean"){
@@ -109,7 +109,7 @@ module.exports.load = ()=>{
           achievement: {
             showHidden: false,
             mergeDuplicate: true,
-            timeMergeRecentFirst: true,
+            timeMergeRecentFirst: false,
             hideZero: false,
             legitSteam: 0
           },

diff --git a/app/view/app.html b/app/view/app.html
@@ -420,8 +420,8 @@
                         <div class="right">
                          <div class="previous"><span class="arrow"><i class="fas fa-chevron-left"></i></span></div>
                           <select autocomplete="off" id="option_timeMergeRecentFirst">
-                            <option value="true" selected></option>
-                            <option value="false"></option>
+                            <option value="false" selected></option>
+                            <option value="true"></option>
                           </select>
                          <div class="next"><span class="arrow"><i class="fas fa-chevron-right"></i></span></div>
                         </div>

diff --git a/service/src/watchdog/watchdog.js b/service/src/watchdog/watchdog.js
@@ -222,7 +222,7 @@ var app = {
         }
 
         if (typeof self.options.achievement.timeMergeRecentFirst !== "boolean"){
-          self.options.achievement.timeMergeRecentFirst = true;
+          self.options.achievement.timeMergeRecentFirst = false;
           fixFile = true;
         }
 
@@ -318,7 +318,7 @@ var app = {
           achievement: {
             showHidden: false,
             mergeDuplicate: true,
-            timeMergeRecentFirst: true,
+            timeMergeRecentFirst: false,
             hideZero: false,
             legitSteam: 0
           },