From 838ca28518dd2b9448b5d5a5a9a5810f88ac11c4 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Wed, 23 Mar 2016 20:20:38 +0300 Subject: [PATCH 1/2] Minor warning fix. --- drape/utils/gpu_mem_tracker.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drape/utils/gpu_mem_tracker.cpp b/drape/utils/gpu_mem_tracker.cpp index 1d63bdca7a..7aa95c2021 100644 --- a/drape/utils/gpu_mem_tracker.cpp +++ b/drape/utils/gpu_mem_tracker.cpp @@ -49,7 +49,7 @@ string GPUMemTracker::Report() ss << " ===== Mem Report ===== \n"; - return move(ss.str()); + return ss.str(); } void GPUMemTracker::AddAllocated(string const & tag, uint32_t id, uint32_t size) From 7fd10145898856f39c38b6e23243632820c50b20 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Wed, 23 Mar 2016 20:21:21 +0300 Subject: [PATCH 2/2] [android] Fixed invalid unsent edits counter. --- android/src/com/mapswithme/maps/editor/ProfileFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/com/mapswithme/maps/editor/ProfileFragment.java b/android/src/com/mapswithme/maps/editor/ProfileFragment.java index 0f20826325..8364764ef9 100644 --- a/android/src/com/mapswithme/maps/editor/ProfileFragment.java +++ b/android/src/com/mapswithme/maps/editor/ProfileFragment.java @@ -66,7 +66,7 @@ public class ProfileFragment extends AuthFragment implements View.OnClickListene UiUtils.hide(mLogout); } final long[] stats = Editor.nativeGetStats(); - mEditsLocal.setText(getString(R.string.not_sent) + ": " + stats[0]); + mEditsLocal.setText(getString(R.string.not_sent) + ": " + (stats[0] - stats[1])); mEditsSent.setText(getString(R.string.changes) + ": " + stats[1]); if (stats[1] == 0) UiUtils.hide(mEditsSentDate);