Avoid Windows poll macro collision in activity monitor
This commit is contained in:
1 parent
c3468987cb
commit
376695e410
2 files changed
+4
-4
No files matched your search
@@ -29,7 +29,7 @@
|
||||
|
||||
UserActivityMonitor::UserActivityMonitor(QObject* parent) : QObject(parent) {
|
||||
m_pollTimer.setInterval(250);
|
||||
connect(&m_pollTimer, &QTimer::timeout, this, &UserActivityMonitor::poll);
|
||||
connect(&m_pollTimer, &QTimer::timeout, this, &UserActivityMonitor::pollIdleTime);
|
||||
}
|
||||
|
||||
UserActivityMonitor::~UserActivityMonitor() {
|
||||
@@ -51,7 +51,7 @@ void UserActivityMonitor::start() {
|
||||
if (wayland && !m_gnomeUnavailable) {
|
||||
m_useGnome = true;
|
||||
m_pollTimer.start();
|
||||
poll();
|
||||
pollIdleTime();
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
@@ -107,7 +107,7 @@ void UserActivityMonitor::checkIdleTime(qint64 idleMs, qint64 elapsedMs) {
|
||||
emit activity();
|
||||
}
|
||||
|
||||
void UserActivityMonitor::poll() {
|
||||
void UserActivityMonitor::pollIdleTime() {
|
||||
#ifdef UTUN_ACTIVITY_DBUS
|
||||
if (m_useGnome) {
|
||||
if (m_dbusPending) return;
|
||||
|
||||
Reference in new issue
Block a user