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

New commits:
commit f94b42d9a8de3c0f9269fc94659707e147d04512
Author: Aditya Dewan <iit2015...@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/37672
    Reviewed-by: pranavk <pran...@collabora.co.uk>
    Tested-by: pranavk <pran...@collabora.co.uk>

diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp
index 700b860b..8e899d26 100644
--- a/wsd/Admin.cpp
+++ b/wsd/Admin.cpp
@@ -327,7 +327,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();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to