[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-2-1' - wsd/Admin.cpp

[Aditya Dewan]

 wsd/Admin.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3a4fb3f1fa137872800d835c9bcf25ec065c1d15
Author: Aditya Dewan <iit2015097 at iiita.ac.in>
Date:   Tue May 16 15:43:57 2017 +0530

    tdf#107762 admin-console: memory graph in 'Analytics' tab now working
    
    Change-Id: I6a0ee82e813e80344eaf6ddb7d46eebed98ca5bb
    Reviewed-on: https://gerrit.libreoffice.org/37674
    Reviewed-by: pranavk <pranavk at collabora.co.uk>
    Tested-by: pranavk <pranavk at collabora.co.uk>

diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp
index a9039f2b..3c51afcd 100644
--- a/wsd/Admin.cpp
+++ b/wsd/Admin.cpp
@@ -322,7 +322,7 @@ void Admin::pollingThread()
             cpuWait += _cpuStatsTaskIntervalMs;
         }
         int memWait = _memStatsTaskIntervalMs -
-            std::chrono::duration_cast<std::chrono::milliseconds>(now - lastCPU).count();
+            std::chrono::duration_cast<std::chrono::milliseconds>(now - lastMem).count();
         if (memWait <= 0)
         {
             const auto totalMem = getTotalMemoryUsage();