From 926da88c100034a2e37328a4232d8e5037c6b0be Mon Sep 17 00:00:00 2001
From: arcan1s <esalexeev@gmail.com>
Date: Mon, 9 Jun 2014 15:39:55 +0400
Subject: [PATCH] fix ps

---
 sources/ext-sysmon/extsysmon.cpp | 12 ++++++++----
 sources/ext-sysmon/extsysmon.h   |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/sources/ext-sysmon/extsysmon.cpp b/sources/ext-sysmon/extsysmon.cpp
index 6144df0..93c10dd 100644
--- a/sources/ext-sysmon/extsysmon.cpp
+++ b/sources/ext-sysmon/extsysmon.cpp
@@ -182,10 +182,10 @@ void ExtendedSysMon::setProcesses()
     // ps
     // pscount && ps
     processes[QString("ps")].append(new QProcess);
-    connect(processes[QString("ps")][0], SIGNAL(readyReadStandardOutput()), this, SLOT(setPs()));
     // pstotal
     processes[QString("ps")].append(new QProcess);
-    connect(processes[QString("ps")][1], SIGNAL(readyReadStandardOutput()), this, SLOT(setPs()));
+    connect(processes[QString("ps")][1], SIGNAL(finished(int, QProcess::ExitStatus)),
+            this, SLOT(setPs(int, QProcess::ExitStatus)));
 }
 
 
@@ -588,9 +588,12 @@ void ExtendedSysMon::getPsStats()
 }
 
 
-void ExtendedSysMon::setPs()
+void ExtendedSysMon::setPs(int exitCode, QProcess::ExitStatus exitStatus)
 {
+    Q_UNUSED(exitStatus)
+
     if (debug) qDebug() << "[DE]" << "[setPs]";
+    if (debug) qDebug() << "[DE]" << "[setPs]" << ":" << "Cmd returns" << exitCode;
     QString qoutput = QString("");
     for (int i=0; i<processes[QString("ps")].count(); i++) {
         qoutput = QTextCodec::codecForMib(106)->toUnicode(processes[QString("ps")][i]->readAllStandardOutput()).trimmed();
@@ -600,7 +603,8 @@ void ExtendedSysMon::setPs()
                 // pscount && ps
                 QStringList psList;
                 for (int i=0; i<qoutput.split(QChar('\n'), QString::SkipEmptyParts).count(); i++)
-                    if (qoutput.split(QChar('\n'), QString::SkipEmptyParts)[i] != QString("ps --no-headers -o command"))
+                    if (!qoutput.split(QChar('\n'), QString::SkipEmptyParts)[i].
+                        contains(QString("ps ")))
                         psList.append(qoutput.split(QChar('\n'), QString::SkipEmptyParts)[i]);
                 QString source = QString("ps");
                 QString key = QString("psCount");
diff --git a/sources/ext-sysmon/extsysmon.h b/sources/ext-sysmon/extsysmon.h
index 0890e7e..2d52650 100644
--- a/sources/ext-sysmon/extsysmon.h
+++ b/sources/ext-sysmon/extsysmon.h
@@ -53,7 +53,7 @@ private slots:
     void setHddTemp(int exitCode, QProcess::ExitStatus exitStatus);
     void setUpgradeInfo(int exitCode, QProcess::ExitStatus exitStatus);
     void setPlayer(int exitCode, QProcess::ExitStatus exitStatus);
-    void setPs();
+    void setPs(int exitCode, QProcess::ExitStatus exitStatus);
 
 private:
     // processes