Merge branch 'hotfix/1.0.7'

RetroAchievements · May 7, 2018 · 7584575 · 7584575
2 parents d2407e2 + 4d875d1
commit 7584575
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/src/Application.cpp b/src/Application.cpp
@@ -99,7 +99,6 @@ bool Application::init(const char* title, int width, int height)
   inited = kNothingInited;
 
   _emulator = Emulator::kNone;
-  _recentListLoaded = false;
 
   if (!_logger.init())
   {
@@ -425,14 +424,11 @@ void Application::run()
 
 void Application::destroy()
 {
-  if (_recentListLoaded)
-  {
-    std::string json = "{\"recent\":";
-    json += serializeRecentList();
-    json += "}";
+  std::string json = "{\"recent\":";
+  json += serializeRecentList();
+  json += "}";
 
-    util::saveFile(&_logger, getConfigPath(), json.c_str(), json.length());
-  }
+  util::saveFile(&_logger, getConfigPath(), json.c_str(), json.length());
 
   RA_Shutdown();
 
@@ -1391,7 +1387,6 @@ void Application::loadRecentList()
     });
 
     free(data);
-    _recentListLoaded = res == JSONSAX_OK;
   }
 }
 

diff --git a/src/Application.h b/src/Application.h
@@ -134,7 +134,6 @@ class Application
 
   KeyBinds _keybinds;
   std::vector<RecentItem> _recentList;
-  bool _recentListLoaded;
 
   Allocator<256 * 1024> _allocator;