From 7657996e98d11c344518bd32d10f79e6c1b78e4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Thu, 12 Mar 2015 15:15:17 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@26 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5 --- utils/system_daemon/daemon.cpp | 4 +++- utils/system_daemon/daemon.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/utils/system_daemon/daemon.cpp b/utils/system_daemon/daemon.cpp index f6912806..5225ee47 100644 --- a/utils/system_daemon/daemon.cpp +++ b/utils/system_daemon/daemon.cpp @@ -142,12 +142,14 @@ void Daemon::timerEvent(void * _d, int delim) { } -PIStringList Daemon::availableDaemons() const { +PIStringList Daemon::availableDaemons() { available_daemons.clear(); + lock(); piForeachC (PIPeer::PeerInfo & p, allPeers()) { if (!p.name.startsWith("_pisd_")) continue; available_daemons << p.name.mid(6); } + unlock(); return available_daemons; } diff --git a/utils/system_daemon/daemon.h b/utils/system_daemon/daemon.h index 48222aa3..2a3d2925 100644 --- a/utils/system_daemon/daemon.h +++ b/utils/system_daemon/daemon.h @@ -39,7 +39,7 @@ public: void showMainList() {showTile(list_daemons, "Select daemon");} void showActionList() {showTile(list_actions, "Select action");} - PIStringList availableDaemons() const; + PIStringList availableDaemons(); void connectToDaemon(const PIString & dn); void disconnect();