Merge branch 'mem'

save memory leak fixes

src/core/i18n/Locale.cpp

@@ -55,9 +55,11 @@ static nlohmann::json loadLocaleData(const std::string& fn) {
     char* bytes = nullptr;
     int count = 0;
 
-    if (FileToByteArray(fn, &bytes, count, true)) {
+    if (FileToByteArray(fn, &bytes, count, true) == true) {
         try {
-            return nlohmann::json::parse(bytes);
+            nlohmann::json localeData = nlohmann::json::parse(bytes);
+            free(bytes);
+            return localeData;
         }
         catch (...) {
         }
@@ -180,4 +182,4 @@ int Locale::Dimension(const char* key, int defaultValue) {
     }
 
     return defaultValue; /* not found anywhere */
-}
+}

src/musikcube/app/window/LogWindow.cpp

@@ -59,6 +59,7 @@ LogWindow::LogWindow(IWindow *parent)
 }
 
 LogWindow::~LogWindow() {
+    delete this->adapter;
 }
 
 IScrollAdapter& LogWindow::GetScrollAdapter() {